Allow '&' in country names.

Wherever there's an "and" in a country name, allow "&" as a shorthand
character (e.g. "St. Kitts and Nevis" can be written "St. Kitts &
Nevis").
Fixed list formatting.

Removed automatic alphabetizing of the guessed countries list and
corrected formatting so it doesn't spill over and out of view.
Cleaned up todo, and corrected some country codes.