Nathan/vagrant space fix2

More fixes for the space problem.

Note that I didn't test all provisioners, but I applied the same fix as for vagrant so it should be fine.