Upgrade Rails

Gemfile with dependency updates. Changed secret_token to secrets.yml.
Merge branch 'rails_4_1_1' into staging