refactoring user BDD tests and changing lock/admin methods to post and delete instead of put(update)
change perms back to 644
fixed signin path for devise, added /my prefix to match routes
changed routing for lock/make admin/reset password paths
Fixed user BDD to work with Rob's new changes and refactored routes to [controller]/[object]/[action] where needed.
Merge pull request #344 from dpaterson/pull-req-master-8b25bba644d2437a65ad2e6b2278c6ecbacacc1a

Merged by devtool for aabes