Correct google login link

Resolved minor merge issues between dev and this branch.
Last commit for issue #2.  Now correctly round tripping the google
authentication.