Committing various last minutes changes before tagging as v1
Merge branch 'master' of https://github.com/soichih/osg-blast

Conflicts:
	test/run.sh