humorist

n. Humorous writer, talker, or actor.

n. One who attributes diseases of the state of the humors.