Manually merged scala-2.10 and master

.gitignore

README.md

bagel/pom.xml

bagel/src/main/scala/spark/bagel/Bagel.scala

...c/main/scala/spark/bagel/examples/WikipediaPageRank.scala

...la/spark/bagel/examples/WikipediaPageRankStandalone.scala

bagel/src/test/resources/log4j.properties

bagel/src/test/scala/bagel/BagelSuite.scala

bin/spark-daemon.sh

bin/spark-daemons.sh

bin/start-master.sh

bin/start-slave.sh

bin/start-slaves.sh

bin/stop-master.sh

bin/stop-slaves.sh

conf/spark-env.sh.template

core/pom.xml

core/src/main/scala/spark/Accumulators.scala

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

core/src/main/scala/spark/CacheManager.scala