gofmt -w; fix var decls
Merge pull request #2 from peterbourgon/master

gofmt -w; fix var decls