remember to set attname if django < 1.7
Updated travis.yml to use tox.
Merge pull request #201 from apollo13/atomic

Use Django's atomic when available.
Prevented infinite loops on Tag.save()

Note: Now Tag.save() can raise an IntegrityError in case of concurrency
issues, your app will need to handle that.
Merge pull request #196 from gizmag/set-taggable-manager-attname

remember to set attname if django < 1.7
Merge pull request #202 from apollo13/atomic2

Prevented infinite loops on Tag.save()
Added support for Django 1.7 migrations.
Fixed migration support for Django 1.7.
Handle non-default kwargs in deconstruct

According to the documentation [1], non-default kwargs need to get
returned.

1: https://docs.djangoproject.com/en/dev/howto/custom-model-fields/#field-deconstruction
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
Handle "to" with deconstruction

This accepts "to" as kwarg, and provides it via `deconstruct`, and also
changes `deconstruct` to always provide/set "through".

This is more explicit and since the manager always uses a through model
internally, this describes it better.
Allow pluggable manager for TaggableManager.
Wrong south setting in the docs

Should be `SOUTH_MIGRATION_MODULES`, see:
http://south.readthedocs.org/en/latest/settings.html#south-migration-modules
fix contenttypes.generic warning in django 1.7
manager default to _TaggableManager in kwarg, swap class placement for import.
Tests and test model for custom manager.
Docs update
Merge pull request #216 from collinanderson/develop

fix contenttypes.generic warning in django 1.7
Merge pull request #214 from MeirKriheli/develop

Wrong south setting in the docs