Updated osm-and-geojson
Quick fixes, closes #39 closes #40