encoding changes... seems like I'll never get this right
Merge branch 'master' of github.com:iggy/simone

Conflicts:
	mail/views.py