Turned up stopThreads timeout threshold.
Merge branch 'ShapeExperiment' of github.com:Orego/Orego into ShapeExperiment

Conflicts:
	config/experiment.properties