Run 'gofmt -s -w'
Merge pull request #3480 from tianon/gofmt

Run 'gofmt -s -w'