Remove unused imports and simplify
[collegehumor] Fix test

The description simply changed, our code is working fine
[traileraddict] Fix extraction
[vube] Use 'id' and 'ext' instead of 'file'
[cspan] Fix extraction (fixes #2291)

The webpage urls have changed.
The title and thumbnail are now extracted from an xml.
[tinypic] Add support for tinypic.com videos (Closes #2210)
Merge branch 'master' of https://github.com/rg3/youtube-dl
Merge pull request #2274 from z00nx/master

[bliptv] Filter out SRT files
[BlipTV] Add a test case w/ subtitles (#2274)
[blip.tv] Add support for subtitles (#2274)
Merge remote-tracking branch 'origin/master'

Conflicts:
	youtube_dl/extractor/bliptv.py
Add --ignore-config option (Fixes #633)
release 2014.02.03
[vimeo] Add support for subtitles (Closes #2239)
[vimeo] Add subtitle tests
[vimeo] Remove superfluous whitespace
[generic] Add support for multiple brightcove URLs (Fixes #2283)
release 2014.02.03.1
[iprima] Add support for play.iprima.cz
[traileraddict] mark as broken

traileraddict has changed their URL encoding scheme.
I'm working on restoring support, but that may take some time.