Test clean-up
Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/testInsert.js
1st pass at rules for bulk insert