Cleaned up some changes that were too drastic
Add CONST to the set of words needing #undefd after Microsoft headers
One more kind<T>() fix
Port a couple of things that didn't compile in MSVC
Fix uncaughtExceptionCount() for MSVC 14