Merge branch 'master' of https://github.com/wyrie/puppet-backuppc