Better approach to Twitter email and Facebook location

This does a bit better at loading the twitter email field - twitter's API will not provide an email address but if we need something in this field it should better approximate an email address.  A twitter username is unique so we can use that as the root + @twitter.com.

I also added a location from facebook so we have more fields filled.