Cleanup
Merge branch 'vagrant' of github.com:wchrisjohnson/vagrant-devstack-config into vagrant