Configure tox and requirements to test with django 1.6
Merge pull request #451 from diox/tox-add-django-1.6

Configure tox and requirements to test with django 1.6