Update routes file

remove "match" with proper verbs
Update deprecated block format used by devise
Tweaks to user updating of password
Merge branch 'master' into rails_4_0