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.