add .swp to .gitignore
Add option to headers.transform for decoding encoded-words
Merge branch 'master' into stable

Conflicts:
	setup.py