Initial work on integrating new lexer
Fix some lexing issues
Split modules during lexing
Artificially indent module contents by one character
Fix optional indentation, add a test.