Stash generate refactor - this tries to simplify url structure and update to new marked optimizations
Merge branch 'fixed-layout' into generate-refactor

Conflicts:
	_docs/generate.js
	_includes/api.nav.html
Merge branch 'fixed-layout' of github.com:mapbox/mapbox.js into fixed-layout

Conflicts:
	_layouts/default.html
	_posts/plugins/0100-01-01-leaflet-draw.html
	_posts/plugins/0100-01-01-leaflet-fullscreen.html
	_posts/plugins/0100-01-01-leaflet-hash.html
	_posts/plugins/0100-01-01-leaflet-image.html
	_posts/plugins/0100-01-01-leaflet-label.html
	_posts/plugins/0100-01-01-leaflet-locate.html
	_posts/plugins/0100-01-01-leaflet-markercluster.html
	_posts/plugins/0100-01-01-leaflet-osm.html