Cleaning up and fixing a mistake metaclass causing classes to get wrong names.
Merge branch 'atom/enaml' into control_panel