go fmt.

result of `gofmt -w -s .` without vendors.
Merge pull request #2964 from andrewsmedina/gofmt2

go fmt.