switched hard coded form_for urls to rails conventions
added tests for passwords_controller and added s's to 'password' in various files
added tests for passwords_controller and added s's to 'password' in various files
fixing merge conflictsMerge branch 'master' into password-edit-view-tests2
fixing merge conflictsMerge branch 'password-edit-view-tests2'