Add zero-width space character before and after matches for emoji aliases to prevent multiple aliases from matching and being converted (fix #1054).
Merge pull request #1138 from JabbR/fix-emoticons

Add zero-width space character before and after matches for emoji aliases