The newspeak word for that is humorist. Update your style manual.
;-)
I believe Mark Twain was a humorist. Barney Frank is a BAD comedian.