Tidy up windows fix for makefile
Add watch task for auto building.