Pull request to get updates from master

Switch to using jquery to parse geoJSON.