Merging all of our leaflet work into develop

This includes some loading and styling updates for the map.