new query folder structure. updating tilestache.conf (notice that the user/password/database are in sync with the chef's spec - gisuser/password/gis)
Merge branch 'master' of https://github.com/mapzen/vector-datasource

Conflicts:
	tilestache.cfg
Merge branch 'hkrishna-master'
syncing with upstream