renames ChoiceLexer to ChoiceBruteForceLexer
Merge branch 'master' into 46-remove-symbol-reduction

Conflicts:
	pydsl/Lex.py
	tests/unit/test_Lexer.py
adds Encoding.__hash__
Merge branch 'master' into 46-remove-symbol-reduction
fixes a bad merge