Fix gofmt/boilerplate verification scripts and associated files.

Please merge soon so no more breakage gets past travis.
Make this one line now that it's shorter?