Added no_split_separate and no_split_grouped options to clustersetup in
workflow

Now ready to redo clustering