Edits to work with new deployment of openstack, but still hopefully remain backwards compatible.
Merge branch 'master' of https://github.com/jaredbischof/BulkVM