Merge pull request #689 from smfreegard/master

Misc updates.
Merge pull request #692 from smfreegard/master

SpamAssassin plugin fixes