Use a single set of config files
Fix some warnings in puppet 3.x