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

Conflicts:
	lib/vagrant-proxyconf/action/configure_pear_proxy.rb
Merge branch 'master' of github.com:hexmode/vagrant-proxyconf