makefile updates
Merge branch 'master' of github.com:gigablast/open-source-search-engine

Conflicts:
	Version.h