Add network info, code cleanup
Merge pull request #2 from nickvanw/sysinfo

Add network info, code cleanup