resolve merge conflict
fix proxy class name
add onwer, group and permissions to proxy file
make mode 4 digit
remove firewall from the ordered chain because if you choose to turn the firewall off puppet breaks
add missing semi-column from merge process
Merge pull request #30 from dcrissman/proxy2

Enable configuration of the proxy from jenkins-puppet (take 2)
merge master