Vagrantfile and minor fabfile changes