Rails 4.1 compatibility
Merge pull request #6 from zendesk/bquorning/rails-4.1

Rails 4.1 compatibility