Port vagrant script fixes to fix-fingers branch