FP avoidance tuning, PUMPDUMP tuning, push some rules

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1633632 13f79535-47bb-0310-9956-ffa450edef68