Richer text generation for labels

[bdon]

cartocss example: text-name: [NAME] + ', ' + [ADM1NAME];