Merge pull request #37 from basho/jdb-integrity

Conflicts:
	tools.mk