working vagrant/puppet deploy
merge