Improved appveyor build matrix