Don't set through in Django < 1.7 (validation doesn't allow it).
Merge branch 'develop' into deconstruct-keep-non-defaults

This probably fixes the travis builds.

Conflicts:
	taggit/managers.py