Fix vagrant file

Include the right number of virtual disks in the vagrant file.  Tweak
some commenting too.