makeRU takes isEVM as argument, no longer hardcoded to index==0
Following new naming conventions
Added 40GE cabling to printSwitchCabling.
Fixed EVM instances