Get BSPDiff working again, and commit a nicer Makefile