Not entirely sure what all I've changed in these, but right now I have
something that's working for what I have here.
There's some key makefile changes, which allow for easier updating.
Most of the other updates are more a matter of just things that are
getting added to the main project.
