Merge branch 'testing' into diffbot-matt

Conflicts:
	Collectiondb.cpp
	Make.depend
	Parms.cpp
Merge branch 'diffbot-matt' of github.com:gigablast/open-source-search-engine into diffbot-matt

Conflicts:
	Collectiondb.cpp