Updated to support vagrant-proxyconf
Merge branch 'master' of https://github.com/indieisaconcept/vagrant-stack