fix map / update to new map
test
Merge branch 'andyWorking' into gh-pages

Conflicts:
	readme.md
	script.js
Merge branch 'mapboxjs' into gh-pages

Conflicts:
	script.js
new zoom levels