new branch, don't look. :)
cleaning up for oauthless login
Merge branch 'master' into DriveAnony
logging in works