move vagrant command to vagrant sub dir, minor formatting tweaks and update to heredocs in unittests commands