Bump rails version
Ran bundle update
Merge branch 'update-gems'