Makefile WIP

Based off of https://raw.github.com/rzr/nullfs/869bd3ee7209ff3a209e80d0166d08a9451db78c/Makefile
Minor Makefile changes