Revert to leaflet 0.5
Merge branch 'master' into gh-pages