Cleaned up Go formatting with gofmt.
Merge pull request #1349 from mbrukman/gofmt

Cleaned up Go formatting with gofmt.