Fixes for escape-handling for string literals in SMT-LIBv2 lexer
Oops.. premature push on lexer fix (remove debugging output)
Minor fix for previous commit
minor fix for merge
minor cleanup for merge
Merge branch 'master' of github.com:tiliang/CVC4