Fix problems with django-wiki and our version of django-activity-stream