diff --git a/src/Libraries/MediaInfo/MediaInfo.dll b/src/Libraries/MediaInfo/MediaInfo.dll
index 36a9191a9..dcd8637ea 100644
Binary files a/src/Libraries/MediaInfo/MediaInfo.dll and b/src/Libraries/MediaInfo/MediaInfo.dll differ
diff --git a/src/Libraries/MediaInfo/libmediainfo.0.dylib b/src/Libraries/MediaInfo/libmediainfo.0.dylib
index c783903e0..091dcaec1 100644
Binary files a/src/Libraries/MediaInfo/libmediainfo.0.dylib and b/src/Libraries/MediaInfo/libmediainfo.0.dylib differ
diff --git a/src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs b/src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs
index 1132f8e82..918d8db5e 100644
--- a/src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs
+++ b/src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs
@@ -66,13 +66,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         private Response LogError(NancyContext context, Exception exception)
         {
             var response = _errorPipeline.HandleException(context, exception);
-
             context.Response = response;
-
             LogEnd(context);
-
             context.Response = null;
-
             return response;
         }
 
@@ -80,12 +76,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         {
             if (request.Url.Query.IsNotNullOrWhiteSpace())
             {
-                return string.Concat(request.Url.Path, "?", request.Url.Query);
-            }
-            else
-            {
-                return request.Url.Path;
+                return string.Concat(request.Url.Path, request.Url.Query);
             }
+            return request.Url.Path;
         }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/DownloadStationFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
similarity index 99%
rename from src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/DownloadStationFixture.cs
rename to src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
index 04b368129..546a603fa 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/DownloadStationFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
@@ -16,7 +16,7 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 {
     [TestFixture]
-    public class DownloadStationFixture : DownloadClientFixtureBase<DownloadStation>
+    public class TorrentDownloadStationFixture : DownloadClientFixtureBase<TorrentDownloadStation>
     {
         protected DownloadStationSettings _settings;
 
diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 651c726e5..cef8c2283 100644
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -183,7 +183,7 @@
     <Compile Include="Download\DownloadClientTests\TransmissionTests\TransmissionFixtureBase.cs" />
     <Compile Include="Download\DownloadClientTests\UTorrentTests\UTorrentFixture.cs" />
     <Compile Include="Download\DownloadClientTests\VuzeTests\VuzeFixture.cs" />
-    <Compile Include="Download\DownloadClientTests\DownloadStationTests\DownloadStationFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
     <Compile Include="Download\DownloadServiceFixture.cs" />
diff --git a/src/NzbDrone.Core/Datastore/Migration/132_rename_torrent_downloadstation.cs b/src/NzbDrone.Core/Datastore/Migration/132_rename_torrent_downloadstation.cs
new file mode 100644
index 000000000..7bfaa543c
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/132_rename_torrent_downloadstation.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(132)]
+    public class rename_torrent_downloadstation : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.Sql("UPDATE DownloadClients SET Implementation = 'TorrentDownloadStation' WHERE Implementation = 'DownloadStation';");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
similarity index 98%
rename from src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs
rename to src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
index d09af800a..410576d16 100644
--- a/src/NzbDrone.Core/Download/Clients/DownloadStation/DownloadStation.cs
+++ b/src/NzbDrone.Core/Download/Clients/DownloadStation/TorrentDownloadStation.cs
@@ -18,13 +18,13 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Download.Clients.DownloadStation
 {
-    public class DownloadStation : TorrentClientBase<DownloadStationSettings>
+    public class TorrentDownloadStation : TorrentClientBase<DownloadStationSettings>
     {
         protected readonly IDownloadStationProxy _proxy;
         protected readonly ISharedFolderResolver _sharedFolderResolver;
         protected readonly ISerialNumberProvider _serialNumberProvider;
 
-        public DownloadStation(IDownloadStationProxy proxy,
+        public TorrentDownloadStation(IDownloadStationProxy proxy,
                                ITorrentFileInfoReader torrentFileInfoReader,
                                IHttpClient httpClient,
                                IConfigService configService,
diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index de939341b..01fa26016 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -48,6 +48,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
                 yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
                 yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org"));
+                yield return GetDefinition("omgwtfnzbs", GetSettings("https://api.omgwtfnzbs.me"));
                 yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
                 yield return GetDefinition("PFmonkey", GetSettings("https://www.pfmonkey.com"));
                 yield return GetDefinition("SimplyNZBs", GetSettings("https://simplynzbs.com"));
diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs
index 969b927db..18cc850bf 100644
--- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs
+++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoImport.cs
@@ -16,31 +16,13 @@ namespace NzbDrone.Core.NetImport.CouchPotato
     public class CouchPotatoImport : HttpNetImportBase<CouchPotatoSettings>
     {
         public override string Name => "CouchPotato";
-        public override bool Enabled => true;
+        public override bool Enabled => false;
         public override bool EnableAuto => false;
 
         public CouchPotatoImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
             : base(httpClient, configService, parsingService, logger)
         { }
 
-        /*public new virtual IEnumerable<ProviderDefinition> DefaultDefinitions
-        {
-            get
-            {
-                var config = (CouchPotatoSettings)new CouchPotatoSettings();
-                config.Link = "http://localhost";
-                config.Port = "5050";
-
-                yield return new NetImportDefinition
-                {
-                    Name = "Localhost",
-                    Enabled = config.Validate().IsValid && Enabled,
-                    Implementation = GetType().Name,
-                    Settings = config
-                };
-            }
-        }*/
-
         public override INetImportRequestGenerator GetRequestGenerator()
         {
             return new CouchPotatoRequestGenerator() { Settings = Settings };
diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs
index d7d9dde09..cb675271d 100644
--- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs
+++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs
@@ -15,9 +15,9 @@ namespace NzbDrone.Core.NetImport.RSSImport
 {
     public class RSSImport : HttpNetImportBase<RSSImportSettings>
     {
-        public override string Name => "RSSList";
-        public override bool Enabled => true;
-        public override bool EnableAuto => true;
+        public override string Name => "RSS";
+        public override bool Enabled => false;
+        public override bool EnableAuto => false;
 
         public RSSImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
             : base(httpClient, configService, parsingService, logger)
diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs
index 95c1d9b9e..86179fd82 100644
--- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs
+++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuImport.cs
@@ -16,8 +16,8 @@ namespace NzbDrone.Core.NetImport.StevenLu
     public class StevenLuImport : HttpNetImportBase<StevenLuSettings>
     {
         public override string Name => "StevenLu";
-        public override bool Enabled => true;
-        public override bool EnableAuto => true;
+        public override bool Enabled => false;
+        public override bool EnableAuto => false;
 
         public StevenLuImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
             : base(httpClient, configService, parsingService, logger)
diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs
index 733983bfc..14f484e79 100644
--- a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs
+++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs
@@ -8,8 +8,8 @@ namespace NzbDrone.Core.NetImport.TMDb
 {
     public class TMDbImport : HttpNetImportBase<TMDbSettings>
     {
-        public override string Name => "TMDb Lists";
-        public override bool Enabled => true;
+        public override string Name => "TMDb";
+        public override bool Enabled => false;
         public override bool EnableAuto => false;
         private readonly IHttpClient _httpClient;
         private readonly Logger _logger;
diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs
index 2add8de16..a879927d7 100644
--- a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs
+++ b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs
@@ -15,8 +15,8 @@ namespace NzbDrone.Core.NetImport.Trakt
 {
     public class TraktImport : HttpNetImportBase<TraktSettings>
     {
-        public override string Name => "Trakt List";
-        public override bool Enabled => true;
+        public override string Name => "Trakt";
+        public override bool Enabled => false;
         public override bool EnableAuto => false;
 
         public TraktImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger)
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index abe9267e5..1c110c948 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -127,6 +127,7 @@
     <Compile Include="Datastore\Migration\129_add_parsed_movie_info_to_pending_release.cs" />
     <Compile Include="Datastore\Migration\128_remove_kickass.cs" />
     <Compile Include="Datastore\Migration\130_remove_wombles_kickass.cs" />
+    <Compile Include="Datastore\Migration\132_rename_torrent_downloadstation.cs" />
     <Compile Include="NetImport\TMDb\TMDbLanguageCodes.cs" />
     <Compile Include="NetImport\TMDb\TMDbSettings.cs" />
     <Compile Include="NetImport\TMDb\TMDbListType.cs" />
@@ -419,7 +420,7 @@
     <Compile Include="Download\Clients\Deluge\DelugeUpdateUIResult.cs" />
     <Compile Include="Download\Clients\DownloadClientAuthenticationException.cs" />
     <Compile Include="Download\Clients\DownloadClientException.cs" />
-    <Compile Include="Download\Clients\DownloadStation\DownloadStation.cs" />
+    <Compile Include="Download\Clients\DownloadStation\TorrentDownloadStation.cs" />
     <Compile Include="Download\Clients\DownloadStation\Proxies\DownloadStationProxy.cs" />
     <Compile Include="Download\Clients\DownloadStation\DownloadStationSettings.cs" />
     <Compile Include="Download\Clients\DownloadStation\DownloadStationTorrent.cs" />