Fix broken MANIFEST.in file
Fix Django trunk tests in tox and Travis
Fix bug for Django 1.6
Bump version to 1.2.1 (package and minor bug fix)
Bump version
Fix Travis configuration