Housekeeping - initial #8 fixes

I did the changes commit by commit. Should be self-explanatory :)

You will need to configure AppVeyor to `nuget restore` as per http://blog.appveyor.com/2014/03/18/about-nuget-package-restore/