Format addresses

Pivotal: https://www.pivotaltracker.com/story/show/44079473

This internationalises the layout of contact addresses based on the country of origin. It also stops "United Kingdom" from being rendered for GB addresses, which was deemed superflous.

Note: there is a data migration that adds some missing iso2 country codes.