Merge new stuf since the last hack
Merge branch 'master' into Producti
streak counter
bring in hashtag/url/at-reply censor
import logging
right variable names
Merge branch 'hotfix/importlogging'
Merge branch 'streakcounter'