Merge branch 'master' into ec2-updates

assembly/pom.xml

assembly/src/main/assembly/assembly.xml

bagel/pom.xml

bin/compute-classpath.cmd

bin/compute-classpath.sh

bin/spark-daemon.sh

conf/metrics.properties.template

conf/slaves

conf/spark-env.sh.template

core/pom.xml

core/src/main/resources/spark/ui/static/bootstrap.min.css

core/src/main/resources/spark/ui/static/webui.css

...cala/org/apache/hadoop/mapred/SparkHadoopMapRedUtil.scala

...rg/apache/hadoop/mapreduce/SparkHadoopMapReduceUtil.scala

core/src/main/scala/spark/Aggregator.scala

core/src/main/scala/spark/BlockStoreShuffleFetcher.scala

core/src/main/scala/spark/Cache.scala

core/src/main/scala/spark/Dependency.scala

core/src/main/scala/spark/MapOutputTracker.scala

core/src/main/scala/spark/PairRDDFunctions.scala