Add ClusterCount(), fix edit errors in unionfind.h