Merge branch 'blockmanager' of github.com:rxin/spark into blockmanager

Conflicts:
	core/src/main/scala/spark/storage/DiskStore.scala
Build against Hadoop 1 by default
Merge branch 'master' of github.com:mesos/spark into blockmanager
Added a shuffle block manager so it is easier in the future to
consolidate shuffle output files.
Allow specifying the shuffle write file buffer size. The default buffer
size is 8KB in FastBufferedOutputStream, which is too small and would
cause a lot of disk seeks.
Fix issues reported by Reynold
Merge pull request #585 from pwendell/listener-perf

[Fix SPARK-742] Task Metrics should not employ per-record timing by default
Merge branch 'master' of github.com:mridulm/spark
If key is not valid, close connection
Be more aggressive and defensive in select also
Change indentation
Merge branch 'master' of github.com:mridulm/spark
Be more aggressive and defensive in all uses of SelectionKey in select loop
Spurious commit, reverting gitignore change
Add addition catch block for exception too
Merge branch 'master' of github.com:mridulm/spark
Merge branch 'master' of github.com:mesos/spark into blockmanager

Conflicts:
	core/src/main/scala/spark/BlockStoreShuffleFetcher.scala
Two minor fixes according to Ryan LeCompte's review.
Modified as per TD's suggestions
Merge pull request #586 from mridulm/master

Pull request to address issues Reynold Xin reported