Merge pull request #270 from smfreegard/master

Swap order of EHLO/HELO and rDNS in Received header
Fix end-of-headers marker detection