Minor updates to config files for Rails 4 rc 2
Remove a couple unnecessary gems
Merge branch 'master' into bootstrap-3