remakerings, corrected vagrantfile
Merge branch 'master' of https://github.com/bunchc/OpenStackCookBook