Add django 1.6 to tox.
Also add support for running tests against 3.3.
Merge pull request #29 from jasonkeene/tox-and-16

Add django 1.6 to tox.