buzz meter updated
updated buzz
Merge branch 'master' of https://github.com/Copesch/critweet

Conflicts:
	critweet_django/rtomato/templates/rtomato/stream.html
	critweet_django/rtomato/views.pyc

test