initial work for sudo opts
Merge branch 'master' of git://github.com/mitchellh/vagrant