Update richard to master tip; fix django_browserid bits