water as "natural" is what makes oceans blue
Merge branch 'master' of github.com:hkrishna/vector-datasource

Conflicts:
	queries/water-areas-z12.pgsql