fix user update when logged in with Google
fix normal signup without Google
add integration testing for happy and sad path user registration
pass tests and comment out Google login path
merge capybara_user branch