minor mods
Merge branch 'master' of https://github.com/drelu/kmeans

Conflicts:
	python/experiments/mahout.py
YARN-EMR config