Django 1.6 support

Almost no code changes (except for json import), just runtests.py update to account for new testrunner behavior