changing routes to try to fix omniauth
adding back in form for current password
changing the controllers to not override devise