Updates Rails 4.0.3 to 4.0.4, along with gems
Merge branch 'update-rails'
Merge branch 'master' into add-and-remove-groups