Merge pull request #143 from jdgleaver/msvc-fix

Fix msvc2005/msvc2010 builds
21 jobs for master in 26 minutes and 11 seconds (queued for 91 minutes and 25 seconds)