Configure tox and requirements to test with django 1.6

This adds django 1.6 to the tests.

My local `tox` is acting a little weird, so this is not 100% tested yet - `make testenv` + `make test` in a clean virtualenv work, though.