Feature/vagrant/branch