Newer docker

Don't merge
Thanks.  I also remember that it's not too hard to mount /vagrant as something other than the current working directory.  It would be nice to have the VM in the pickett dir, but still do the right thing (mount the user's home directory)