Made password reset a little better. Took out token controller
Implemented current_user method and got rid of user routing dependency