Final changes to the countries list.
Merge pull request #86 from alphagov/countries_renaming

Final changes to the countries list.