Adding OSX/Windows builds, updating Makefile