adding a new base map
Merge branch 'mapboxjs' into gh-pages

Conflicts:
	script.js