Add OSM and Thunderforest map layers
Merge branch 'osm-demo-layers' into gh-pages