make more idempotent
Merge branch 'master' of https://github.com/jonschipp/vagrant