Test against Django trunk with tox
Rename tox environments with -master suffix
Merge pull request #91 from django/test-against-trunk

Test against Django trunk with tox