Merge branch 'master' of github.com:hexmode/vagrant-proxyconf
Merge branch 'master' of github.com:hexmode/vagrant-proxyconf