ignore vim tmp files
Update vagrant stuff to use official template and call the first box "puppetmaster"
Update docs and Vagrantfile for first multi-VM setup
Various updates and cleanups