Created queryset-refactor branch, for Malcolm's refactoring of django.db.models.query and related code