Cleanup
Bunch of work cleaning up Adium message formats

Generators used extensively.