USC Stuff
Merge branch 'lpedrosa' of github.com:arifogel/batfish into lpedrosa
Merge remote-tracking branch 'origin/unstable' into lpedrosa

Conflicts:
	projects/batfish/src/batfish/logicblox/ConfigurationFactExtractor.java
	projects/batfish/src/batfish/representation/PolicyMapMatchTagLine.java
	projects/batfish/src/batfish/representation/cisco/CiscoVendorConfiguration.java
Now parsing all USC configs (not just routers).
Merge remote-tracking branch 'origin/unstable' into lpedrosa
Intermediate commit before merging.
Merge remote-tracking branch 'origin/unstable' into lpedrosa
USC Stuff
Merge remote-tracking branch 'origin/unstable' into lpedrosa
Merge remote-tracking branch 'origin/unstable' into lpedrosa
Formatting.
merge from hell with lpedrosa after finding usc bugs
merge with unstable