Tweak the lexer

To make it easier to implement.
Merge branch 'master' of github.com:xrchz/vml