markup changes to reflect some base revisions
Merge branch 'gh-pages' of github.com:mapbox/tilemill into gh-pages
Merge branch 'gh-pages' into staging