Please update your repo with my mostly-makefile changes