Fix problems with the AppVeyor builds
Project file cleanup
Fix Visual Studio keeps trying to add a service item to the test project
Merge pull request #42 from sharwell/fix-build

Fix the AppVeyor build errors