Bug/master/no default puppet conf

This just sits here and waits for stepping-stone/syslog-ng#2.