Bumping Rails version
Merge pull request #1096 from elzj/rails_3020

Bumping Rails version