Break down puppet args into smaller sections
Add ability to configure smtp host for zuul e-mail