support rails 4.2
Merge pull request #451 from zacksiri/master

support rails 4.2