For everyone paying attention, I created a topic/seth/super-merge branch last night. There is no new code going into that branch, it's merely a way for some people to be able to run a bunch of development branches more easily.
It's like pre-pre-pre-alpha code or something. 
I'll be deleting once all of the relevant code is merged into master.
  .Seth