Bit of work on the lexing system.
Merge branch 'master' of https://github.com/currysoup/csc