fixed the default rc.conf a bit
Merge branch 'master' of builder:git/spark-rc