Merge branch 'master' of https://github.com/dvlchd3/flexget