New emoticon engine, forgot version update.
Merge branch 'master' of https://github.com/scoundrels/scrib