Merge pull request #833 from shuffle2/msvc-improvements misc improvements for msvc build. -Werror for msvc!
