Feature/msbuild fixes

Give me some love, Travis!