app-emulation/vagrant: add patches (forgot in last commit).
Remove Vagrantfile.

Until a testing strategy is developed that works I've removed the
vagrant file.
Remove puppet for holland configuration.
Merge branch 'master' into reviews/cleanup
app-emulation/cloud-init: removed from overlay.

This one has made it into the tree thanks to prometheanfire.