Set puppetrun setting to true

Plus minor refactoring