Fix goimports and go fmt calling
Merge pull request #807 from dlsniper/fix-gofmt

Fix goimports and go fmt calling (fixes #792)