Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master

diff --cc README.md
Simple merge

diff --cc youtube_dl/YoutubeDL.py
Simple merge

diff --cc youtube_dl/__init__.py
Simple merge

diff --cc youtube_dl/options.py
Simple merge

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