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

Conflicts:
	apps/videos/tasks.py
Bad merge is bad.
1284: Add short description
1284: Rename gauge function
1284: Add simple remover task

Ported from the remove_youtube_credit script.  Untested.
Merge branch 'production' into i-1284
1284: reverse() now takes `no_locale` kwarg.
1284: Remove locale from shortlinks
Merge pull request #106 from pculture/production

Merge from production
Merge branch 'i-2074' into prod-test
Merge branch 'production' into prod-test
Merge branch 'production' into prod-test
Merge branch 'production' into i-1284
2148: Added udacity openid endpoint, but i still
need some logo to put on the login page.
Hide the YT call
Merge commit '1cbde5292676870c0c61a0279807ed2f8e59f80d' into production
Hide the YT call
Remove TOS and redirect to about.amara version
Merge commit '8bb4bb419dfb4495143aca5c8694fe8c7644923a' into production
Merge branch 'production' into prod-test