Removing the test commit of CoreyAna.  Also adding a few tweaks to
run_cluster_merge.py