CartoCSS improvements via @jbranigan
Merge pull request #537 from mtedeschi/topic/branigan-cartocss

CartoCSS improvements via @jbranigan