Updated combined UML

I updated the combined UML using Violet (which is horrible) based on the
lovely outline Steve posted. Bloated UML for the win..