simplifying country codes

Trying to simplify country code management started in this PR: https://github.com/onomojo/i18n_country_select/pull/18