Merge pull request #302 from andylyall/develop

Develop
Merge branch 'develop' of https://github.com/greese/dasein-cloud-core into develop