Updates to build scripts.
Merge branch 'master' of https://github.com/sylus/vagrant-normandy