Moved compelx merging out of efsm.py
Modified the mechanics of adding transitions.