mahout measures
Merge branch 'master' of github.com:drelu/kmeans

Conflicts:
	python/rand/random_cluster_generator.py