bug fixes
Merge branch 'master' into pradeep-kmeans

Conflicts:
	src/distributed_inmem/dataunit.py
	src/kmeans/kmeans.py
Merge branch 'pradeep-kmeans'