edit Vagrantfile
Merge branch 'master' of https://github.com/wakamonog/vagrant-init