go vet fixes
Merge pull request #128 from burke/govet

go vet fixes