Copied in the Ubuntu-centric config now
Merge old and new
Merge branch 'master' of https://github.com/apache/infra-puppet