Update to Rails 4.0.1
Merge branch 'advanced-scoping'