Fix issues identified by go vet
Merge pull request #16 from jpfielding/govet

Fix issues identified by go vet