Use autoload to extricate ourselves from dependency hell
Resolve conflicts
Resolve conflicts
Fix MessageBuilder spec