MOR FIX
Remove rails 4 stuffs
Mergy merge
Fix crazy merge
Merge pull request #3 from bmneely/more-fixes

More fixes