Add country to user

* Makes country mandatory after User creation (fixes #75)
* Leaves `User#location` as is, but refer to it as "City"
* Fixes #73