Updated rails to 4.0.5
Merge branch 'upgrade-rails'