Updated official and common names for Macau and Hong Kong.
Now uses capital-cities.csv to define capital cities. Property renamed to 'capitalCity'.

Also removes some deprecated properties.
Minor font size/contrast improvements for readability.