Restructure
Fix errors
Merge remote-tracking branch 'upstream/master' into mail
Fix include path
ldap not needed
deps << ldap-client pam
Merge branch 'master' into mail

Conflicts:
	data/mail.yml
exports << src
Merge pull request #159 from mvidner/mail

Mail restructured