Lots of Merging

Alright, this one is big.

I merged in all of the drawing code that Clay did, and all of the database stuff from Alex and Matt, and put it in with my tab stuff. So I think this is the latest-and-greatest of everything we did over the past week.

I don't know how the database / XML stuff works, so I couldn't test that. I may have broken it during the merge.

Please review quickly so we can merge into master and start building on this. There are too many changes waiting, and it's going to be confusing to work until we get everyone on the same baseline again.