Merge All The Things!

Because the 3 branches I just pullreq'd won't merge together cleanly, I took the liberty of merging them for you.