Added email to user. Refactored User.find_or_create_from_auth_hash