Merge branch 'prefer-webm' of ssh://github.com/rbrito/youtube-dl into prefer-webm