Support mapnik keywords in filters and error on bare keywords. Fixes
Merge branch 'master' of github.com:mapbox/carto