Move a couple of commmon bits of code out to utils.go
Revert "Move a couple of commmon bits of code out to utils.go"

This reverts commit c1856e1ff16d5f100d2fb3a445c921656872a7ee.
Merge branch '23_retry_peers' of https://github.com/bboreham/weave into 23_retry_peers
remove debugging code added by accident