Merge pull request #37 from markhamstra/master-csd

Cherry-picks from 0.9.0-SNAPSHOT to build with Spark 0.8.1
Merge pull request #38 from markhamstra/master-csd

Shark to 0.8.1