VS 2010 and .NET 4.0 Compatability

These are similar to the changes before, but I cleaned them up. I tried to avoid the JSON.NET upgrade, but it appears there's a documented issue that was fixed.