Updated build config for AppVeyor use
Merged