update to Rails 4.1 (defaults)
rails routes the 4.1-way
Typo when merging