Compatibility with rails 4.1
Merge pull request #2 from johnkelly/rails41

Compatibility with rails 4.1