Merge working/Makefile into Makefile.

I would love to be shown how to remove `@true` from this Makefile but I've been pouring over the docs and I just can't figure it out ;-)