Upgrading to leaflet 0.6
Merging master