grim/convey

grim/convey/network/
golint "no else necessary for return" fixes

2018-01-14, Gary Kramlich
93014ac12e40