Minor tweaks to running a small spark cluster
Merge remote-tracking branch 'origin/master'