Merge pull request #448 from puppetlabs/daenney/kill-file-perms