fix unicode typenames (illegal in py2)
fix unicode event names
Merge pull request #2639 from kived/factory-unicode-typename

fix unicode and Builder in Python 2