Detect Visual Studio in a way that works correctly with NMake files
Merge pull request #284 from peastman/master

Detect Visual Studio in a way that works correctly with NMake files