UC-45 Pass back and save the user country at registration.

We use this to determine what kind of email opt-in/out to do.

https://wikia-inc.atlassian.net/browse/UC-45
The bulk of this file is formatting changes.  I'll note the exceptions.