Stop using padding in the generated Gemfile -- it looks shit
Merge branch 'master' of github.com:rails/rails
Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools