Merge remote-tracking branch 'origin/master' into ratul
Merge remote-tracking branch 'origin/unstable' into ratul
mo' parsing
mo' parsing
what else? more parsing
more parsing
[hopefully] semantics-preserving grammar cleanup
use modes now for des and sha1 hashes
Merge remote-tracking branch 'origin/ratul' into unstable

Conflicts:
	projects/batfish/src/batfish/grammar/cisco/CiscoGrammarCommonLexer.g4
fixed bug where network was only created in one branch
fixed banner non-word-boundary-^C parsing
don't allow arbitrary text at end of cisco_configuration
added parse tree pretty-printing
autoformatted CiscoGrammar.g4 now that it no longer breaks
minor grammar factoring
completely rewrote VARIABLE lexer rule, got rid of unnecessary modes
merge with unstable
bug fixed