FileDownloader: Simplify and document
Fix GoogleSearchIE (Fixes #822)
Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/InfoExtractors.py