import django_diazomiddleware package
Merge branch 'master' of github.com:kroman0/django-diazomiddleware

Conflicts:
	.gitignore