Force logout for all users and change oauth scope to include email
Use extracted common code for getting new data from user
On login pick up primary email address
Whitespace changes only