rails updated
Merge pull request #7 from BenMorganIO/rails-update

rails updated
Merge branch 'master' into tests