rephrased my code a little.
Conflicts:
	youtube_dl/InfoExtractors.py
trying to rebase mt code