Added Makefile formating patch from Brian Callahan.