Revert "Merge branch 'develop' of git://github.com/greese/dasein-cloud-openstack"

This reverts commit 08bc5fad25ec36819cd6626271f9bf4519c016ab, reversing
changes made to 46213d7b98bdb6c2934bceaa186dac1ad5fcc1dc.