Updated geocode.py to override country names and/or the row to select for the geocoding result.  This fixes the issue where a handful of countries could not be geocoded as well as the pile of countries that were mistakenly geocoded to France.