Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Set default country code if ip lookup succeeded

GeoIP seems to have a case where some IP lookups succeed, but they
don't map to a country. In these cases we'll fall back to XX which
is being used when the IP is valid but the origin undetermined.
Merge pull request #16 from gravesm/master

Set default country code for successful IP lookups