Changed cluster_launcher for ultra runs.
Merge remote-tracking branch 'thelmuth/ultra-and-env' into ultra-and-env

Conflicts:
	cluster_launcher.py