update rails
Merge pull request #1 from littlestarling/master

update rails