emergency bug fixes
quick fix
nothing
fix another core
nothing
fix injection bugs
Merge branch 'testing' of git@github.com:gigablast/open-source-search-engine into testing

Conflicts:

	Makefile