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