Fix travis and tests

This does something similar for django-nyt that I did recently for django-wiki. I've separated it out into logical changes which should all be explained by the commit messages. Note that previously the tests were not running on the implied combinations of Django versions - the tests ran only against Django 1.6