try to fix core on neo
fix for using more than 32k colls
Merge branch 'diffbot-testing' of github.com:gigablast/open-source-search-engine into diffbot-testing
Merge branch 'diffbot-testing' into testing

Conflicts:
	Collectiondb.cpp
	Spider.cpp