I removed (temporarily) the call to aria2c, so that the merge would be
easier, as the downloading was refactored.
Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
Conflicts:
test/test_playlists.py
test/test_utils.py
youtube_dl/FileDownloader.py
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/extractor/__init__.py
youtube_dl/extractor/anitube.py
youtube_dl/extractor/bandcamp.py
youtube_dl/extractor/common.py
youtube_dl/extractor/gamekings.py
youtube_dl/extractor/generic.py
youtube_dl/extractor/livestream.py
youtube_dl/extractor/soundcloud.py
youtube_dl/extractor/southparkstudios.py
youtube_dl/extractor/spiegel.py
youtube_dl/extractor/toutv.py
youtube_dl/extractor/videopremium.py
youtube_dl/extractor/vimeo.py
youtube_dl/extractor/youtube.py
youtube_dl/extractor/zdf.py
youtube_dl/update.py
youtube_dl/version.py
