Updating default.html
Merge branch 'gh-pages' into newmast

Conflicts:
	_layouts/default.html
update default.html
update default.html
Merge pull request #372 from mapbox/newmast

Newmast