Tidy up how COUNTRIES_ONLY works
Ensure country names are translated before sorting to avoid excessive calls to ugettext

Refs #41