Add TwoLetterCountryCode data type

Also, pull out the hacky country code data into the util directory.