storm.py: better CMD handling
peg.py: new MergAttr class + some class reordering
interpreter.py: boilerplate for type expressions
grammar.py: better parsing of ADT definitions