Remove deprecation warning for emoji
Merge pull request #602 from pierallard/rails4

Remove deprecation warning for emoji