Update country-map.csv

Fix some country names (e.g. Austrian --> Austria)
 Update dependency to hadoop 2.4

This avoids an UnknownHostExecption caused in travis.

See travis-ci/travis-ci#issues/2970.
Merge branch 'master' into integrationTest-remove-osm-lookup