Merge pull request #104 from donthorp/kandan-15

Extended emoticon plugin to support emoji fixes #15.