Added additional Spark options
Made Spark master parameter backwords compatible
Merge pull request #556 from DrAA/master

Added additional Spark parameters