add a property to identify underlying land polygons
move land area queries to files
add osm2pgsql import style file to include columns expected by vector tile queries
turn off caching for local testing (leaving rest of config in place so cache can be back to 'Disk' if desired)
turn on CORS headers
change postgres defaults for local dev
Merge branch 'master' of https://github.com/mapzen/vector-datasource

Conflicts:
	tilestache.cfg