Break up code into modules.
Fixing up broken lines.
Correct dependency problems from having removed stages.
Merge branch 'master' of github.com:datr/puppet-mail-harness