Updated to Rails 4.1.
Updated bundle for Rails 4.1.
Merge branch 'master' into staging
Merge branch 'staging' into prod