mapbox integration!
mapbox integration!
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_includes/head.html