fixes for Rails 4 compatibility
Merge pull request #15 from mattvanhorn/master

fixes for Rails 4 compatibility