vagrant/build fixes (hopefully)

@himedlooff: my vagrant has gone down. Could you please pull these changes locally and make sure they work before accepting. If you have issues, please let me know.

Thanks!