Fixed a few things that go vet was complaining about
Merge pull request #320 from alex/go-vet

Fixed a few things that go vet was complaining about