fixed aggregate script
Merge branch 'master' of https://github.com/ericwhyne/docent-learner

Conflicts:
	src/admin.py