Fixing errors of a bad merge. closes #44 and #45
Merge branch 'torrentProviders' into torrent_1080_subtitles