Merge pull request #71 from gabceb/master

Added real emoticons to emoticons plugin
Added vimeo plugin