Rails fixes
Merge pull request #45 from johnholdun/rails-fixes

Rails fixes