Merge pull request #857 from shuffle2/msvc-improvements windows: remove now-extraneous NOMINMAX and WIN32_LEAN_AND_MEAN #defines