Alternate fix for matching files

I attacked the problem of extraneous file matching from a different direction.  Our style is sloppier here, so added some rules to the puppet-lint check.