lexer fixes
fixes
Merge branch 'yay3' of github.com:isotoma/yay into yay3

Conflicts:
	yay/tests/test_dogfood.py