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

Conflicts:
	spark/java/target/scala-2.10/kmeans-spark-java_2.10-1.0.jar
work on benchmark