Passes golint
Merge pull request #11 from peterbourgon/master

Fixes to pass `golint`