USC Stuff
Merge branch 'lpedrosa' of github.com:arifogel/batfish into lpedrosa

Conflicts:
	projects/batfish/src/batfish/representation/cisco/CiscoVendorConfiguration.java
USC Stuff