This is such a large change and extremely important for future maintenance, so while there are a couple things that need to be adjusted, I'm going to go ahead and merge it. Thank y'all for figuring out the osxcross stuff especially, that's a big weight off my shoulders.
