removed gj
Merge branch 'master' into gh-pages
geojson source
geojson cleanup