Removed some debug output
Switched to geojson for rendering markers
Merge branch 'develop-simpler' into gh-pages