Aggregated all sample points to driver without any shuffle
Merge remote-tracking branch 'apache/master' into conf2

Conflicts:
	project/SparkBuild.scala
Simplify ExternalAppendOnlyMap on the assumption that the mergeCombiners function is specified
Merge pull request #126 from jegonzal/FixingPersist

Fixing Persist Behavior
Merge remote-tracking branch 'apache-github/master' into log4j-fix-2

Conflicts:
	streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
Merge pull request #312 from pwendell/log4j-fix-2

SPARK-1008: Logging improvments

1. Adds a default log4j file that gets loaded if users haven't specified a log4j file.
2. Isolates use of the tools assembly jar. I found this produced SLF4J warnings
   after building with SBT (and I've seen similar warnings on the mailing list).
Merge remote-tracking branch 'upstream/master' into sparsesvd
Merge remote-tracking branch 'apache/master' into conf2

Conflicts:
	core/src/main/scala/org/apache/spark/SparkContext.scala
	core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
	core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala
Miscellaneous fixes from code review.

Also replaced SparkConf.getOrElse with just a "get" that takes a default
value, and added getInt, getLong, etc to make code that uses this
simpler later on.
Fixed two uses of conf.get with no default value in Mesos
New documentation
tweaks to docs
doc tweaks
doc tweak
doc tweaks
remove accidental changes to ec2 script
old version of spark_ec2
javadoc for sparsesvd
Fix Python code after change of getOrElse
more docs yay