Merge branch 'x-youtube-username-fix' into prod-test

Conflicts:
	apps/videos/tasks.py
Bad merge is bad.
12298: Prevent duplicate users with gmail openid.

I'm not sure why this is happening, but we can work around it by using
the email to lookup the UserProfile object instead of the openid key.