Some changes to cluster_launcher.
Merge remote-tracking branch 'thelmuth/experiments' into experiments