Merge pull request #405 from jrperritt/master

go fmt