Django 1.7 and testing refresh

To prep for future work, update testing infrastructure and fix a stupid typo in my tox setup.