Deleting some files that were resurrected by the #2058 PR.
Merge remote-tracking branch 'fluffyfreak/Cleanup' into HEAD
Fix VS2010 build & uninitialized values
changelog update