Updates to makefile, cleaned out SJLJ as not needed on win32