map some more country name variations to three-letter codes (see #10)
Merge remote-tracking branch 'origin/master'