Fix logic on finding/creating users when authenticating via OAuth.

If a user already exists with the same email address, try to merge them.
If a user doesn't already exist, create it, and then prompt the user for
their school.