Updates based on django-roundup feedback