general code cleaning
refactor - reduces code size
style refactoring
Merge branch 'master' into 61-grammar_first

Conflicts:
	pydsl/Grammar/BNF.py