Merge pull request #923 from rustyswayne/1.5.0

Refactored SmtpNotificationGatewayMethod based on Jame South's recommend ation in Buzz.Hybrid
Merge remote-tracking branch 'merchello/1.5.0' into 1.5.0