Lots of tweaks.  makeclusters/clusters.R now saves clustering vectors