Simplified and revised wording.
Pulled in new nics code that works on Fedora 20 - might break others - needs cross-platform testing