Pull latest SparkBuild.scala from master and merge conflicts