Did a "rake rails:update" to complete the upgrade to Rails 4.0.0
Merge branch 'rails4-upgrade' into rails4