Merge branch 'flickr' of github.com:remitamine/youtube-dl into remitamine-flickr