Updated bundle. Specified Rails 4.0.x.
Merge branch 'master' into staging
Merge branch 'staging' into prod