Added support for SHP, JSON, geoJSON (untested), modified geoJSON files, updated comments