Fixed cluster_launcher.py for faster runs.
thelmuth/cluster-launcher-speed
Merge branch 'master' into ultra-and-env

Conflicts:
	cluster_launcher.py