VS/NuGet updates.

These are changes that have accrued over time. Merging these before upgrading VS/NuGet to 0.6.0.
OK, I'll test without the lib. I do t see how this becomes a conflict, it should just be a change. Can you pls merge and resolve to the new version?