Get SparkConf from SparkEnv, rather than creating new ones
Add more timing logging
Merge changes