2013-11-20 GeoJSON update
Merge branch 'master' of github.com:ryanfb/pleiades-geojson

Conflicts:
	name_index.json
2013-12-04 GeoJSON update