Some cleanup and update Leaflet to 0.7.2