(ENoC) More results.  Minor bug fixes.
Merge branch 'ENoC_3D' of https://github.com/DannyNicholls/NetEmulation into ENoC_3D