This makes it a hell of a lot simpler but will lose support for BSD make. All effected machines are running gnu-make, so the cost benefit ratio ways heavily in favor of doing this.
This includes a reference to diff-so-fancy which does not exist on any of my current servers. I will need to update this.