WIP: Changes to get Vagrant/docker working