This again...
Merge pull request #21 from Shopify/fix_spark_home_again

[WIP] Fix spark home again