Fix broken sbt from git merges
Stop writing the hadoop class path property to spark-defaults.conf, and instead use HADOOP_CONF_DIR