Initial boxen-puppet-kdiff3 commit (original baseline repo copied from git@github.com:boxen/puppet-repository.git)