Everything we've been running from my tree for a while

This is all the stuff we've already been running. The masters have just been pointed at my fork instead of the OCS fork.