moving stuff around to get the build working on Vagrant.