Merge pull request #18 from markhamstra/master-csd

SPY-221 Necessary (but probably not yet sufficient) changes for a deployable 0.8.0 stack