avatar stuff
Merge branch 'master' of https://github.com/PoorlyWritten/django-mailbot
Merge intros.to:/var/www/oneleap_email_bot-env/oneleap_email_bot
working title
merged
fighting with browserid