Change a location format

It should be <city, two_digit_country_code>
Merge pull request #1 from dangreen/fix/location-format

Change a location format