Clean up Makefile, add watch-build command