Changing Architecture so that GeoJSON is generated from server side.
Merged with Matt's master