Stuff going upstream!

Symbolic pull request! Sending this stuff to bzr to clean my patch queue. Still probably going to add some commits to it still.