Merge branch 'subtitles-rework'

(Closes PR #4964)

diff --cc Makefile
Simple merge

diff --cc youtube_dl/YoutubeDL.py
Simple merge

diff --cc youtube_dl/__init__.py
Simple merge

diff --cc youtube_dl/extractor/common.py
Simple merge

diff --cc youtube_dl/extractor/dailymotion.py
Simple merge

diff --cc youtube_dl/extractor/ted.py
Simple merge

diff --cc youtube_dl/extractor/theplatform.py
Simple merge

diff --cc youtube_dl/extractor/vimeo.py
index 4cd2f73d9962529db31e259011db9ccbfe053ac4,5930d598415a7bb4cd944d58a0831aa1e2bfd27d..8f540f5780570d06fa10e695555026c537b7c0f0
--- 1/youtube_dl/extractor/vimeo.py
--- 2/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@@ -4,10 -4,8 +4,9 @@@ from __future__ import unicode_literal
  import json
  import re
  import itertools
 +import hashlib
  
  from .common import InfoExtractor
- from .subtitles import SubtitlesInfoExtractor
  from ..compat import (
      compat_HTTPError,
      compat_urllib_parse,

diff --cc youtube_dl/extractor/youtube.py
Simple merge

diff --cc youtube_dl/options.py
Simple merge

diff --cc youtube_dl/postprocessor/ffmpeg.py
Simple merge