Merge branch 'master' of https://github.com/10up/varying-vagrant-vagrants
Merge branch 'master' of https://github.com/simonwheatley/varying-vagrant-vagrants