Fixes #2477: Updated country list.
This is clearly less than ideal, and we need to find a way to keep this up to date.