Pin django-taggit to 0.11.2
Django-taggit 0.12.x seems to break wagtail
Merge branch 'master' into treebeard-update

Conflicts:
	setup.py