Merge pull request #611 from smfreegard/master

SPF and SSL/TLS header fixes