Merge pull request #34 from markhamstra/master-csd

Spark and Tachyon off SNAPSHOT