Merging in files from Vagrant talk

Just let me know if I'm missing anything glaring.