Updated appveyor config and makefile