fix for rails 4.1
Merge pull request #29 from jdurand/master

Fix for rails 4.1
Merge remote-tracking branch 'upstream/master' to get Rails 4.1 fixes