Handle puppet config files better