Merging the 'map' branch with master

These two commits add a map visualisation of the waterponts. #efdee02 integrates a Leaflet.js map, whereas #b222139 integrates the clustering.