SparkConf upgrade

This subsumes #227.