diff --git a/.gitignore b/.gitignore
index d938c5a70..dc61ab746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ _ReSharper*/
[Bb]uild/
[Ll]ogs/
[Aa]pp_Data/
-/[Pp]ackage/
+packages/
/FakesAssemblies/
#NZBDrone specific
*.db
diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj
index d45a6540f..be44badd2 100644
--- a/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/NzbDrone.Common/NzbDrone.Common.csproj
@@ -57,10 +57,6 @@
False
..\packages\Exceptron.Client.1.0.7\lib\net20\Exceptron.Client.dll
-
- False
- ..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll
-
False
..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll
diff --git a/NzbDrone.Common/packages.config b/NzbDrone.Common/packages.config
index 7e340a07a..f6c80b659 100644
--- a/NzbDrone.Common/packages.config
+++ b/NzbDrone.Common/packages.config
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index efcdd219c..55548b9ac 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -95,7 +95,7 @@
False
- ..\packages\Newtonsoft.Json.4.5.9\lib\net40\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll
False
@@ -112,9 +112,6 @@
False
..\packages\Prowlin 0.9.4163.39219\Prowlin.dll
-
- ..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll
-
diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config
index 9b4ea2f49..28ee97ae6 100644
--- a/NzbDrone.Core.Test/packages.config
+++ b/NzbDrone.Core.Test/packages.config
@@ -8,10 +8,11 @@
-
+
+
diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs
index a30ef7fc1..b436a073f 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -19,7 +19,6 @@ using PetaPoco;
using SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
-using SignalR.Ninject;
using Connection = NzbDrone.Core.Datastore.Connection;
using Xbmc = NzbDrone.Core.Providers.ExternalNotification.Xbmc;
diff --git a/NzbDrone.Core/NinjectDependencyResolver.cs b/NzbDrone.Core/NinjectDependencyResolver.cs
new file mode 100644
index 000000000..76bf75ba8
--- /dev/null
+++ b/NzbDrone.Core/NinjectDependencyResolver.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Ninject;
+using SignalR;
+
+namespace NzbDrone.Core
+{
+ public class NinjectDependencyResolver : DefaultDependencyResolver
+ {
+ private readonly IKernel _kernel;
+
+ public NinjectDependencyResolver(IKernel kernel)
+ {
+ if (kernel == null)
+ {
+ throw new ArgumentNullException("kernel");
+ }
+
+ _kernel = kernel;
+ }
+
+ public override object GetService(Type serviceType)
+ {
+ return _kernel.TryGet(serviceType) ?? base.GetService(serviceType);
+ }
+
+ public override IEnumerable