Fix Vagrantfile (for Vagrant 1.5+) and some more cosmetic improvements