stage 1 import tool
Merge branch 'testing' of github.com:gigablast/open-source-search-engine into testing

Conflicts:
	Makefile