add :emoji: and emoticon --> emoji support
Merge pull request #1 from aaronmccall/master

add :emoji: and emoticon --> emoji support