what did I change
Merge branch 'master' of https://github.com/erinspace/academiccommons

Conflicts:
	consumer.py