Clean up
Fix http:// ...
Merge pull request #237 from a-x-/patch-0

Clean up
Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

Conflicts:
	class.phpmailer.php