diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
index 4645f4b35..be85ec2c4 100644
Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
deleted file mode 100644
index a2894f4a3..000000000
--- a/.nuget/NuGet.targets
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-
-        <!-- MSBuild Tasks assembly location -->
-      <MSBuildTasksAssembly Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll</MSBuildTasksAssembly>
-      <MSBuildTasksAssembly Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll</MSBuildTasksAssembly>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
-        <!--
-            <PackageSource Include="https://nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-        <PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-        <PackagesDir>$(SolutionDir)packages</PackagesDir>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(RequireConsentSwitch) -o "$(PackagesDir)"</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')"  />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildTasksAssembly)">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-    
-     <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildTasksAssembly)">
-        <ParameterGroup>
-            <EnvKey ParameterType="System.String" Required="true" />
-            <EnvValue ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Using Namespace="System" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
-                }
-                catch  {
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>
\ No newline at end of file
diff --git a/Glimpse.All.sln b/Glimpse.All.sln
index 19d92eb24..3f48171fb 100644
--- a/Glimpse.All.sln
+++ b/Glimpse.All.sln
@@ -36,9 +36,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glimpse.AspNet.Net35", "sou
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{0352975D-08B7-435E-B444-A77292D4F6E1}"
 	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
 		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
diff --git a/Glimpse.Integration.sln b/Glimpse.Integration.sln
index 39f223fca..e4c709c88 100644
--- a/Glimpse.Integration.sln
+++ b/Glimpse.Integration.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{0352975D-08B7-435E-B444-A77292D4F6E1}"
 	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
 		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
diff --git a/psake.bat b/psake.bat
index cd23bb6c1..b5250dfe2 100644
--- a/psake.bat
+++ b/psake.bat
@@ -1,3 +1,4 @@
-@echo off
-.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& {Import-Module '.\packages\psake.*\tools\psake.psm1'; invoke-psake .\default.ps1 %*; if ($LastExitCode -ne 0) {write-host "ERROR: $LastExitCode" -fore RED; exit $lastexitcode} }"
\ No newline at end of file
+@echo off
+.nuget\NuGet.exe install .nuget\packages.config -OutputDirectory packages
+.nuget\NuGet.exe restore Glimpse.All.sln
+powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "& {Import-Module '.\packages\psake.*\tools\psake.psm1'; invoke-psake .\default.ps1 %*; if ($LastExitCode -ne 0) {write-host "ERROR: $LastExitCode" -fore RED; exit $lastexitcode} }"
diff --git a/source/Glimpse.Ado.Net40/Glimpse.Ado.Net40.csproj b/source/Glimpse.Ado.Net40/Glimpse.Ado.Net40.csproj
index 168a13dbe..0c74c9426 100644
--- a/source/Glimpse.Ado.Net40/Glimpse.Ado.Net40.csproj
+++ b/source/Glimpse.Ado.Net40/Glimpse.Ado.Net40.csproj
@@ -63,7 +63,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Ado.Net45/Glimpse.Ado.Net45.csproj b/source/Glimpse.Ado.Net45/Glimpse.Ado.Net45.csproj
index e9ff704ff..f906073f1 100644
--- a/source/Glimpse.Ado.Net45/Glimpse.Ado.Net45.csproj
+++ b/source/Glimpse.Ado.Net45/Glimpse.Ado.Net45.csproj
@@ -79,7 +79,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Ado/Glimpse.Ado.csproj b/source/Glimpse.Ado/Glimpse.Ado.csproj
index 27f749c4e..72c062270 100644
--- a/source/Glimpse.Ado/Glimpse.Ado.csproj
+++ b/source/Glimpse.Ado/Glimpse.Ado.csproj
@@ -141,5 +141,4 @@
   <PropertyGroup>
     <PrepareForBuildDependsOn Condition="!Exists('$(StyleCopMSBuildTargetsFile)')">StyleCopMSBuildTargetsNotFound;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
 </Project>
\ No newline at end of file
diff --git a/source/Glimpse.AspNet.Net40/Glimpse.AspNet.Net40.csproj b/source/Glimpse.AspNet.Net40/Glimpse.AspNet.Net40.csproj
index 4a7cd58de..2954ed506 100644
--- a/source/Glimpse.AspNet.Net40/Glimpse.AspNet.Net40.csproj
+++ b/source/Glimpse.AspNet.Net40/Glimpse.AspNet.Net40.csproj
@@ -61,7 +61,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.AspNet.Net45/Glimpse.AspNet.Net45.csproj b/source/Glimpse.AspNet.Net45/Glimpse.AspNet.Net45.csproj
index cb5eba816..39623a8f7 100644
--- a/source/Glimpse.AspNet.Net45/Glimpse.AspNet.Net45.csproj
+++ b/source/Glimpse.AspNet.Net45/Glimpse.AspNet.Net45.csproj
@@ -78,7 +78,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.AspNet/Glimpse.AspNet.csproj b/source/Glimpse.AspNet/Glimpse.AspNet.csproj
index 5ab47fafe..a6fc8352d 100644
--- a/source/Glimpse.AspNet/Glimpse.AspNet.csproj
+++ b/source/Glimpse.AspNet/Glimpse.AspNet.csproj
@@ -140,7 +140,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Core.Net35/Glimpse.Core.Net35.csproj b/source/Glimpse.Core.Net35/Glimpse.Core.Net35.csproj
index 1efa3a18b..50b43df94 100644
--- a/source/Glimpse.Core.Net35/Glimpse.Core.Net35.csproj
+++ b/source/Glimpse.Core.Net35/Glimpse.Core.Net35.csproj
@@ -111,7 +111,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Core.Net40/Glimpse.Core.Net40.csproj b/source/Glimpse.Core.Net40/Glimpse.Core.Net40.csproj
index 9a38df4b1..871e9cbcb 100644
--- a/source/Glimpse.Core.Net40/Glimpse.Core.Net40.csproj
+++ b/source/Glimpse.Core.Net40/Glimpse.Core.Net40.csproj
@@ -112,7 +112,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Core.Net45/Glimpse.Core.Net45.csproj b/source/Glimpse.Core.Net45/Glimpse.Core.Net45.csproj
index ed995f196..afc2d8068 100644
--- a/source/Glimpse.Core.Net45/Glimpse.Core.Net45.csproj
+++ b/source/Glimpse.Core.Net45/Glimpse.Core.Net45.csproj
@@ -128,7 +128,7 @@
     <Folder Include="NuSpec\lib\net45\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Core/Glimpse.Core.csproj b/source/Glimpse.Core/Glimpse.Core.csproj
index 26174bc00..aac85d97a 100644
--- a/source/Glimpse.Core/Glimpse.Core.csproj
+++ b/source/Glimpse.Core/Glimpse.Core.csproj
@@ -312,7 +312,7 @@
     <EmbeddedResource Include="EmbeddedResources\glimpse_config.html" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF/Glimpse.EF.csproj b/source/Glimpse.EF/Glimpse.EF.csproj
index 991252c25..a79dcc596 100644
--- a/source/Glimpse.EF/Glimpse.EF.csproj
+++ b/source/Glimpse.EF/Glimpse.EF.csproj
@@ -89,7 +89,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF43.Net40/Glimpse.EF43.Net40.csproj b/source/Glimpse.EF43.Net40/Glimpse.EF43.Net40.csproj
index 9acf2eed1..79aa788a3 100644
--- a/source/Glimpse.EF43.Net40/Glimpse.EF43.Net40.csproj
+++ b/source/Glimpse.EF43.Net40/Glimpse.EF43.Net40.csproj
@@ -77,7 +77,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF5.Net40/Glimpse.EF5.Net40.csproj b/source/Glimpse.EF5.Net40/Glimpse.EF5.Net40.csproj
index d1a9a60a0..0be4f40ac 100644
--- a/source/Glimpse.EF5.Net40/Glimpse.EF5.Net40.csproj
+++ b/source/Glimpse.EF5.Net40/Glimpse.EF5.Net40.csproj
@@ -70,7 +70,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF5.Net45/Glimpse.EF5.Net45.csproj b/source/Glimpse.EF5.Net45/Glimpse.EF5.Net45.csproj
index 3514f86af..f2fea4163 100644
--- a/source/Glimpse.EF5.Net45/Glimpse.EF5.Net45.csproj
+++ b/source/Glimpse.EF5.Net45/Glimpse.EF5.Net45.csproj
@@ -82,7 +82,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF6.Net40/Glimpse.EF6.Net40.csproj b/source/Glimpse.EF6.Net40/Glimpse.EF6.Net40.csproj
index 0247af691..27615234f 100644
--- a/source/Glimpse.EF6.Net40/Glimpse.EF6.Net40.csproj
+++ b/source/Glimpse.EF6.Net40/Glimpse.EF6.Net40.csproj
@@ -73,7 +73,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.EF6.Net45/Glimpse.EF6.Net45.csproj b/source/Glimpse.EF6.Net45/Glimpse.EF6.Net45.csproj
index 521fd2d2e..228edf4ac 100644
--- a/source/Glimpse.EF6.Net45/Glimpse.EF6.Net45.csproj
+++ b/source/Glimpse.EF6.Net45/Glimpse.EF6.Net45.csproj
@@ -85,7 +85,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Mvc/Glimpse.Mvc.csproj b/source/Glimpse.Mvc/Glimpse.Mvc.csproj
index 65a48e3a3..21ef70e2b 100644
--- a/source/Glimpse.Mvc/Glimpse.Mvc.csproj
+++ b/source/Glimpse.Mvc/Glimpse.Mvc.csproj
@@ -158,7 +158,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Mvc2/Glimpse.Mvc2.csproj b/source/Glimpse.Mvc2/Glimpse.Mvc2.csproj
index 945e23399..8fa86193f 100644
--- a/source/Glimpse.Mvc2/Glimpse.Mvc2.csproj
+++ b/source/Glimpse.Mvc2/Glimpse.Mvc2.csproj
@@ -87,7 +87,7 @@
     <Folder Include="NuSpec\lib\net35\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Mvc3.MusicStore.Sample/Glimpse.Mvc3.MusicStore.Sample.csproj b/source/Glimpse.Mvc3.MusicStore.Sample/Glimpse.Mvc3.MusicStore.Sample.csproj
index 4e2f21037..22dd3109c 100644
--- a/source/Glimpse.Mvc3.MusicStore.Sample/Glimpse.Mvc3.MusicStore.Sample.csproj
+++ b/source/Glimpse.Mvc3.MusicStore.Sample/Glimpse.Mvc3.MusicStore.Sample.csproj
@@ -303,5 +303,5 @@ copy ASPNETDB_log_ReadOnly.ldf ASPNETDB_log.ldf
 attrib -r ASPNETDB_log.ldf
 )</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
 </Project>
\ No newline at end of file
diff --git a/source/Glimpse.Mvc3/Glimpse.Mvc3.csproj b/source/Glimpse.Mvc3/Glimpse.Mvc3.csproj
index 3c003a48b..e80ed8743 100644
--- a/source/Glimpse.Mvc3/Glimpse.Mvc3.csproj
+++ b/source/Glimpse.Mvc3/Glimpse.Mvc3.csproj
@@ -103,7 +103,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Mvc4.MusicStore.Sample/Glimpse.Mvc4.MusicStore.Sample.csproj b/source/Glimpse.Mvc4.MusicStore.Sample/Glimpse.Mvc4.MusicStore.Sample.csproj
index 59cbe61af..74d3d866f 100644
--- a/source/Glimpse.Mvc4.MusicStore.Sample/Glimpse.Mvc4.MusicStore.Sample.csproj
+++ b/source/Glimpse.Mvc4.MusicStore.Sample/Glimpse.Mvc4.MusicStore.Sample.csproj
@@ -328,7 +328,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)App_Data\
 
diff --git a/source/Glimpse.Mvc4/Glimpse.Mvc4.csproj b/source/Glimpse.Mvc4/Glimpse.Mvc4.csproj
index d6cf3293c..708e8e0a8 100644
--- a/source/Glimpse.Mvc4/Glimpse.Mvc4.csproj
+++ b/source/Glimpse.Mvc4/Glimpse.Mvc4.csproj
@@ -104,7 +104,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Mvc5/Glimpse.Mvc5.csproj b/source/Glimpse.Mvc5/Glimpse.Mvc5.csproj
index 4d70af55b..6dbd9c407 100644
--- a/source/Glimpse.Mvc5/Glimpse.Mvc5.csproj
+++ b/source/Glimpse.Mvc5/Glimpse.Mvc5.csproj
@@ -101,7 +101,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.AspNet/Glimpse.Test.AspNet.csproj b/source/Glimpse.Test.AspNet/Glimpse.Test.AspNet.csproj
index 1bdc1824c..69c5b8c24 100644
--- a/source/Glimpse.Test.AspNet/Glimpse.Test.AspNet.csproj
+++ b/source/Glimpse.Test.AspNet/Glimpse.Test.AspNet.csproj
@@ -119,7 +119,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.Common/Glimpse.Test.Common.csproj b/source/Glimpse.Test.Common/Glimpse.Test.Common.csproj
index a9c5bfba6..1b0f042ee 100644
--- a/source/Glimpse.Test.Common/Glimpse.Test.Common.csproj
+++ b/source/Glimpse.Test.Common/Glimpse.Test.Common.csproj
@@ -122,7 +122,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.Core.Net35/Glimpse.Test.Core.Net35.csproj b/source/Glimpse.Test.Core.Net35/Glimpse.Test.Core.Net35.csproj
index a3bcce611..ac53c2467 100644
--- a/source/Glimpse.Test.Core.Net35/Glimpse.Test.Core.Net35.csproj
+++ b/source/Glimpse.Test.Core.Net35/Glimpse.Test.Core.Net35.csproj
@@ -52,7 +52,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.Core/Glimpse.Test.Core.csproj b/source/Glimpse.Test.Core/Glimpse.Test.Core.csproj
index fd601c4b8..54904c3d8 100644
--- a/source/Glimpse.Test.Core/Glimpse.Test.Core.csproj
+++ b/source/Glimpse.Test.Core/Glimpse.Test.Core.csproj
@@ -214,7 +214,7 @@
     <EmbeddedResource Include="Resource\FileResourceTester.js" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.Integration.Site/Glimpse.Test.Integration.Site.csproj b/source/Glimpse.Test.Integration.Site/Glimpse.Test.Integration.Site.csproj
index 967adee88..b8fd3e6d3 100644
--- a/source/Glimpse.Test.Integration.Site/Glimpse.Test.Integration.Site.csproj
+++ b/source/Glimpse.Test.Integration.Site/Glimpse.Test.Integration.Site.csproj
@@ -203,5 +203,5 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
 </Project>
\ No newline at end of file
diff --git a/source/Glimpse.Test.Integration/Glimpse.Test.Integration.csproj b/source/Glimpse.Test.Integration/Glimpse.Test.Integration.csproj
index 3ce5e925d..11be9da81 100644
--- a/source/Glimpse.Test.Integration/Glimpse.Test.Integration.csproj
+++ b/source/Glimpse.Test.Integration/Glimpse.Test.Integration.csproj
@@ -71,7 +71,7 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.Test.Mvc/Glimpse.Test.Mvc.csproj b/source/Glimpse.Test.Mvc/Glimpse.Test.Mvc.csproj
index 425711e96..565aed71b 100644
--- a/source/Glimpse.Test.Mvc/Glimpse.Test.Mvc.csproj
+++ b/source/Glimpse.Test.Mvc/Glimpse.Test.Mvc.csproj
@@ -180,7 +180,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WebForms.Net40/Glimpse.WebForms.Net40.csproj b/source/Glimpse.WebForms.Net40/Glimpse.WebForms.Net40.csproj
index 70dc849ff..1a832abb5 100644
--- a/source/Glimpse.WebForms.Net40/Glimpse.WebForms.Net40.csproj
+++ b/source/Glimpse.WebForms.Net40/Glimpse.WebForms.Net40.csproj
@@ -68,7 +68,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WebForms.Net45/Glimpse.WebForms.Net45.csproj b/source/Glimpse.WebForms.Net45/Glimpse.WebForms.Net45.csproj
index e28651e28..8498668df 100644
--- a/source/Glimpse.WebForms.Net45/Glimpse.WebForms.Net45.csproj
+++ b/source/Glimpse.WebForms.Net45/Glimpse.WebForms.Net45.csproj
@@ -82,7 +82,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WebForms.WingTip.Sample/Glimpse.WebForms.WingTip.Sample.csproj b/source/Glimpse.WebForms.WingTip.Sample/Glimpse.WebForms.WingTip.Sample.csproj
index d3b00bda8..8dcf03fb5 100644
--- a/source/Glimpse.WebForms.WingTip.Sample/Glimpse.WebForms.WingTip.Sample.csproj
+++ b/source/Glimpse.WebForms.WingTip.Sample/Glimpse.WebForms.WingTip.Sample.csproj
@@ -579,7 +579,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)App_Data\
 
diff --git a/source/Glimpse.WindowsAzure.Caching.Net40/Glimpse.WindowsAzure.Caching.Net40.csproj b/source/Glimpse.WindowsAzure.Caching.Net40/Glimpse.WindowsAzure.Caching.Net40.csproj
index 9741c7217..592db2522 100644
--- a/source/Glimpse.WindowsAzure.Caching.Net40/Glimpse.WindowsAzure.Caching.Net40.csproj
+++ b/source/Glimpse.WindowsAzure.Caching.Net40/Glimpse.WindowsAzure.Caching.Net40.csproj
@@ -91,7 +91,7 @@
     <Folder Include="NuSpec\lib\net40\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.Caching/Glimpse.WindowsAzure.Caching.csproj b/source/Glimpse.WindowsAzure.Caching/Glimpse.WindowsAzure.Caching.csproj
index f31221631..2c02ea28b 100644
--- a/source/Glimpse.WindowsAzure.Caching/Glimpse.WindowsAzure.Caching.csproj
+++ b/source/Glimpse.WindowsAzure.Caching/Glimpse.WindowsAzure.Caching.csproj
@@ -105,7 +105,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.Net40/Glimpse.WindowsAzure.Net40.csproj b/source/Glimpse.WindowsAzure.Net40/Glimpse.WindowsAzure.Net40.csproj
index 940d6062c..9f355c892 100644
--- a/source/Glimpse.WindowsAzure.Net40/Glimpse.WindowsAzure.Net40.csproj
+++ b/source/Glimpse.WindowsAzure.Net40/Glimpse.WindowsAzure.Net40.csproj
@@ -65,7 +65,7 @@
     <Folder Include="NuSpec\lib\net40\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.ServiceBus.Net40/Glimpse.WindowsAzure.ServiceBus.Net40.csproj b/source/Glimpse.WindowsAzure.ServiceBus.Net40/Glimpse.WindowsAzure.ServiceBus.Net40.csproj
index 63c20b058..9e78ccf8a 100644
--- a/source/Glimpse.WindowsAzure.ServiceBus.Net40/Glimpse.WindowsAzure.ServiceBus.Net40.csproj
+++ b/source/Glimpse.WindowsAzure.ServiceBus.Net40/Glimpse.WindowsAzure.ServiceBus.Net40.csproj
@@ -79,7 +79,7 @@
     <Folder Include="NuSpec\lib\net40\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.ServiceBus/Glimpse.WindowsAzure.ServiceBus.csproj b/source/Glimpse.WindowsAzure.ServiceBus/Glimpse.WindowsAzure.ServiceBus.csproj
index 8a4c80b9f..da42c9827 100644
--- a/source/Glimpse.WindowsAzure.ServiceBus/Glimpse.WindowsAzure.ServiceBus.csproj
+++ b/source/Glimpse.WindowsAzure.ServiceBus/Glimpse.WindowsAzure.ServiceBus.csproj
@@ -84,7 +84,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.Storage.Net40/Glimpse.WindowsAzure.Storage.Net40.csproj b/source/Glimpse.WindowsAzure.Storage.Net40/Glimpse.WindowsAzure.Storage.Net40.csproj
index a8d63a772..c35c1cfe4 100644
--- a/source/Glimpse.WindowsAzure.Storage.Net40/Glimpse.WindowsAzure.Storage.Net40.csproj
+++ b/source/Glimpse.WindowsAzure.Storage.Net40/Glimpse.WindowsAzure.Storage.Net40.csproj
@@ -93,7 +93,7 @@
     <Folder Include="NuSpec\lib\net40\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.Storage/Glimpse.WindowsAzure.Storage.csproj b/source/Glimpse.WindowsAzure.Storage/Glimpse.WindowsAzure.Storage.csproj
index 4261ae4dc..d1f762466 100644
--- a/source/Glimpse.WindowsAzure.Storage/Glimpse.WindowsAzure.Storage.csproj
+++ b/source/Glimpse.WindowsAzure.Storage/Glimpse.WindowsAzure.Storage.csproj
@@ -114,7 +114,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure.WebRole.Sample/Glimpse.WindowsAzure.WebRole.Sample.csproj b/source/Glimpse.WindowsAzure.WebRole.Sample/Glimpse.WindowsAzure.WebRole.Sample.csproj
index 8361e2501..ac59da7eb 100644
--- a/source/Glimpse.WindowsAzure.WebRole.Sample/Glimpse.WindowsAzure.WebRole.Sample.csproj
+++ b/source/Glimpse.WindowsAzure.WebRole.Sample/Glimpse.WindowsAzure.WebRole.Sample.csproj
@@ -188,7 +188,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/source/Glimpse.WindowsAzure/Glimpse.WindowsAzure.csproj b/source/Glimpse.WindowsAzure/Glimpse.WindowsAzure.csproj
index 16455ca32..a20de87de 100644
--- a/source/Glimpse.WindowsAzure/Glimpse.WindowsAzure.csproj
+++ b/source/Glimpse.WindowsAzure/Glimpse.WindowsAzure.csproj
@@ -74,7 +74,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">