changes to aggregate stats
Merge branch 'master' of https://github.com/aneumeier/feeds

Conflicts:
	feeds/tasks.py