stupid lexer error fixes that i hate
Merge branch 'unstable' of github.com:arifogel/batfish into unstable