Changed clustering to use faster hierarchical library