Misc changes to Vagrantfile
Merge branch 'master' of https://github.com/awstahl/devops