Merge pull request #160 from math1985/ogr2ogr

Fix for crash of get-shapefiles.sh on populated places ogr2ogr cleanup
Merge branch 'master' of https://github.com/gravitystorm/openstreetmap-carto