go-tour: apply 05ecf5d65670 and 75dda8d5bf79 to default branch

Those changes were mistakenly applied to release-branch.go1.3.

TBR=campoy
R=campoy
CC=golang-codereviews
https://golang.org/cl/113240043
7 files changed