cleaned up code; mangled all the attributes of the mixin
Merge branch 'master' of https://github.com/cversek/python-automat