Cleanup, Go vet/lint updates
Merge pull request #14 from storehouse/govet-updates

Go vet/lint updates