Add -nc to wget to avoid it "not clobber" (or download a *.1 version of it) the file if it already exists.
remove old downloads of scala*tgz before downlaoding and untar-ing a new version.
Update to pass conf object in various places.
Also update test failing shark test cases to use a conf object for testing that skips loading external settings.
One more failing test case that needs conf object passed.
Updated ShuffleSerializer to accept a SparkConf as constructor argument.
Merge pull request #229 from rxin/scala210

SparkConf upgrade
Fix ShuffleSerializerSuite compilation.
Merge pull request #230 from rxin/ser

Fix ShuffleSerializerSuite compilation.
Merge pull request #226 from andyk/master

Add -nc to wget to avoid it "not clobber" (or download a *.n version of) the file if it already exists.
Update build proces for spark now that sbt is no longer shipped with Spark.
Merge pull request #232 from andyk/test-script-spark-sbt-fix

Update build process now that sbt is no longer shipped with Spark
Fix SerializationSuite failures due to uninitialized SharkEnv and SharkContext.
Conflicts:

	src/main/scala/shark/SharkEnv.scala
	src/main/scala/shark/execution/serialization/KryoSerializer.scala
Always launch shark-shell with Java
Merge pull request #234 from harveyfeng/serialization

Fix SerializationSuite failures due to SharkContext NPE
Merge branch 'master' of https://github.com/amplab/shark

Conflicts:
	run