Merge pull request #5 from george-oakling/master

If not AJAX, debug :-)
Merge pull request #8 from george-oakling/geojson

Merge pull request #5 from george-oakling/master