Rename demo.html to index.html
Merge branch 'master' into gh-pages
Readme update
switch to osm