Also add the upcoming Django 1.7 to tox.ini
Rename the test files so that they are picked up by Django 1.6 and 1.7
Fix a test failing in Django 1.6