More thorough test of query builder
Merge branch 'master' into no-quoting-lowercase-names

Conflicts:
	test/index.js
	test/unit/query/builder.js