Updated httpd config for apache 2.2->2.4 upgrade. Updated sshd config
Merge branch 'master' of github.com:justin8/puppet