Merge remote-tracking branch 'nephila/nph'

Conflicts:
	.gitignore
	emencia/django/newsletter/admin/contact.py
	emencia/django/newsletter/locale/it/LC_MESSAGES/django.mo
	emencia/django/newsletter/locale/it/LC_MESSAGES/django.po
	emencia/django/newsletter/mailer.py
	emencia/django/newsletter/management/commands/send_newsletter.py
	emencia/django/newsletter/models.py
	emencia/django/newsletter/settings.py
	emencia/django/newsletter/templates/admin/newsletter/contact/change_list.html
	emencia/django/newsletter/templates/newsletter/contact_import.html
	emencia/django/newsletter/urls/__init__.py

Fixed so SUBSCRIBER_VERIFICATION still exists. Mostly tested, but all works so far. Haven't run the test suite yet (as I know there's at least 4 tests that fail due to how they try to use the smtp service)