Updating timezone mappings

I've verified each timezone manually, and used more specific mappings
wherever appropriate. In some cases, I've chosen cities in the same
nation versus cities in the same timezone as they are more likely to
adhere to future decisions about timezones and DST.
Prettifying timezone mapping