Merge pull request #960 from evoskuil/master

Rationalize and update Visual Studio projects and packaging.
Merge pull request #961 from evoskuil/master

Update NuGet packaging metadata.