Fixed some deprecations and loginc on emotes model.  Updated rake seed to load up new json set.
Merge branch 'master' of github.com:charliemoseley/emotejiji