Some Aggregate refactoring
Merge branch 'master' of https://github.com/burke-software/django-sis