Get rid of deprecation warnings in Rails 4.1
Merge pull request #6 from ndemonner/master

Get rid of deprecation warnings in Rails 4.1