Recommit of Kmeans that works
Merge remote-tracking branch 'upstream/clusterAlgorithms' into clusterAlgorithms