Use our specific builds of Spark.

Conflicts:
	project/SharkBuild.scala
Minor cleanup.