Is my friend correct, or just an annoying anal-retentive grammar nazi?

There shouldn't be a comma inside the quotes for just a single word or term within a larger sentence that is not a quote. You were right. Any grammarian who disagrees doesn't understand the basics of language. The only reason for putting a comma before a quotation mark is if the entire sentence is composed of a quotation.