stuff
Merge branch 'production' of github.com:chriscowley/puppet-master into production
Merge branch 'production' of github.com:chriscowley/puppet-master into production
Merge branch 'production' of github.com:chriscowley/puppet-master into production
Merge branch 'production' of github.com:chriscowley/puppet-master into production
Merge branch 'production' of github.com:chriscowley/puppet-master into production
Merge branch 'production' of ssh://puppet.chriscowley.lan/srv/puppet into production
Log directory for PHP-FPN now has correct owner on ext