various cleanup and todos in Lex
Merge branch 'overhaul' of darwin:scout into overhaul
fixing a few more todos
fix more skew between scout and llvm/clang
Merge branch 'overhaul' of darwin:scout into overhaul