Tidy up with gofmt
Merge pull request #1 from bfirsh/gofmt

Tidy up with gofmt