Added some options to configure proxy options that were hard-coded before
Merge branch 'master' of github.com:deigote/puppet-apache2