fix Makefile that caused bash to crash (infinite loop sourcing) + add git alias for diff --color