Adds windows support

Also includes some cleanup of the existing Makefile.