Merge branch 'master' of https://github.com/apache/spark
Stop making the partitioner configurable.
Merge branch 'master' of git+ssh://github.com/tmyklebu/spark into foo3

Conflicts:
	mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala
	mllib/src/test/scala/org/apache/spark/mllib/recommendation/ALSSuite.scala