Merge branch 'master' of github.com:rob-berkes/wikicount-dbproc

Conflicts:
	threehourrollingavg.py
Merge branch 'master' of github.com:rob-berkes/wikicount-dbproc