Merge pull request #17 from dgryski/golint-fixes

Lint fixes.