Updated travis and tox configs for Django 1.6 release.
Merge pull request #368 from timgraham/django1_6_release

Updated travis and tox configs for Django 1.6 release.