Fix instruction cut & paste typo
Cleanup - use different var for setup vs. cmd script directories
Add Spark support into Magpie