humorist

1. A person with a good sense of humor.
2. A performer or writer of humorous material.

noun

A person whose words or actions provoke or are intended to provoke amusement or laughter: clown, comedian, comic, farceur, funnyman, jester, joker, jokester, quipster, wag², wit, zany. Informal card. See laughter.

n.

A plague that would have softened down the hoar austerity of Pharaoh's heart and persuaded him to dismiss Israel with his best wishes, cat-quick.

    Lo! the poor humorist, whose tortured mind
    See jokes in crowds, though still to gloom inclined --
    Whose simple appetite, untaught to stray,
    His brains, renewed by night, consumes by day.
    He thinks, admitted to an equal sty,
    A graceful hog would bear his company.
                                                        Alexander Poke

The noun has one meaning:

Meaning #1: someone who acts speaks or writes in an amusing way
  Synonym: humourist