Merge remote-tracking branch 'filbertkm/master' into styles

Conflicts:
	resources/map.js
set up gh-pages branch for deploy and updated links
Remove leaflet and add it as a submodule
Fix the filtering
Add links to editors, the JOSM one appears to not work
Fix the JOSM link
Removed redundant code
Add ability to display catchment areas

Still a bit broken in some places...
Fix problems with displaying polygons
Add popups for the catchment areas
Fix key, and display nodes instead of ways for hospitals when zoomed out
Clicking on the catchment areas will now open the hospital popup

The hospital popup now includes information for the hospital and the catchment area,
this informaiton is also now presented in a human readable form, instead of a key
value table. The information in the popup is not complete.
Add the openlayers library, and then use that to calculate the area of a catchment area
Tidy up map.js and op2geojson.js
Merge remote-tracking branch 'fodaro/master'

Conflicts:
	resources/map.js
Use capitalisation
Fix overlay only appearing after the map was moved
Merge remote-tracking branch 'fodaro/master'
Begin work on data analysis
Merge remote-tracking branch 'fodaro/master'