Disable learning within spampd, add back documentation improvements
Merge branch 'spamassassin-simplification' into develop