Slight refactor of CartoCSS for map features
Merge pull request #1405 from RickMohr/tweak-carto-css

Slight refactor of CartoCSS for map features