Fix up some liquid loops to address to changes. ref #2242
Merge branch 'mb-pages' of github.com:mapbox/tilemill into mb-pages