Scrutinizer changes
Make callbacks use consistent arg types
Fix random typing of error property in SMTP class, fixes #242
Make use of $smtp_conn consistent for a resource (i.e. null when not set, not 0)
Make use of $helo_rply consistent
Don't need a constructor any more - property default are fine
Code cleanup
Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

Conflicts:
	class.phpmailer.php