Route fixes for users
Merge branch 'master' into rails_4_0