Slightly more things
Merge branch 'master' of github.com:lewiseason/puppet

Conflicts:
	manifests/classes/mail/postfix.pp
Fix syntax