Update Dockerfile and Vagrantfile