Encode headers just sensibly.
Merge branch 'moriyoshi/encode-heeaders-sensibly' into private-release

Conflicts:
	pyramid_mailer/message.py
Bump version.