More tweaking.
Merge pull request #15 from nessita/more-account-cleanup

More tweaking, require email from social provider.