No more rails 4 deprecation warnings
Merge pull request #1382 from novemberkilo/master

No more rails 4 deprecation warnings