Includes some boring whitespace tweaks. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/5492067
