go fmt
Merge branch 'master' into 23_retry_peers
Merge branch '23_retry_peers' of https://github.com/bboreham/weave into 23_retry_peers