Fixed logging in with facebook and google plus to not overwrite existing user settings.
Fixed logging out to update the header properly.
Merge branch 'production'