Add additional configuration options
Merge branch 'master' of github.com:petermac-/vagrant-shell