Small amount of cleanup when opening sockets to listen on and constructing k/v
pairs.
Merge remove changes
Merge branch 'v0.3' of github.com:prisms-center/resource_discovery into v0.3