Struggling with Khan Academy again...

Conflicts:
	social/backends/khanacademy.py