Use fmt.Errorf
goimports reordering
gofmt -s
Add text for extra argument
Merge pull request #42 from mjibson/master

Style and error fixes