Fix issues with tests and django 1.7

Fixes #259

requirements/django.txt

@@ -1,3 +1,3 @@
-django<1.7
+django
 celery>=2.5.5
 django-celery

run_tests.py

@@ -14,6 +14,9 @@ import django
 os.environ.update({'DJANGO_SETTINGS_MODULE': 'test_settings'})
 sys.path.insert(0, ROOT)
 
+if django.VERSION >= (1, 7, 0):
+    django.setup()
+
 # This can't be imported until after we've fiddled with the
 # environment.
 from django.test.utils import setup_test_environment

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27_es10, py27_es111, py27_es120, py26_dj14, py27_dj14, py26_dj15, py27_dj15, py26_dj16, py27_dj16, py33_dj15, py33_dj16, py34_dj15, py34_dj16
+envlist = py27_es10, py27_es111, py27_es120, py26_dj14, py27_dj14, py26_dj15, py27_dj15, py26_dj16, py27_dj16, py33_dj15, py33_dj16, py34_dj15, py34_dj16, py27_dj17, py33_dj17, py34_dj17
 
 [testenv:py27_es10]
 basepython = python2.7
@@ -86,3 +86,21 @@ basepython = python3.4
 commands = pip install django<1.6.99
            pip install -r requirements/dev.txt
            {envpython} run_tests.py
+
+[testenv:py27_dj17]
+basepython = python2.7
+commands = pip install django<1.7.99
+           pip install -r requirements/dev.txt
+           {envpython} run_tests.py
+
+[testenv:py33_dj17]
+basepython = python3.3
+commands = pip install django<1.7.99
+           pip install -r requirements/dev.txt
+           {envpython} run_tests.py
+
+[testenv:py34_dj17]
+basepython = python3.4
+commands = pip install django<1.7.99
+           pip install -r requirements/dev.txt
+           {envpython} run_tests.py