Fixed a lot of issues I had with the Vagrant and Docker images