Clean up lexer.py a bit
Merge pull request #50 from alex/clean-up-lexer-rules

Clean up lexer.py a bit