Re work formatting in carto. ref mapbox/www.mapbox.com#3953
Merge branch 'mb-pages' of github.com:mapbox/carto into mb-pages