a pass at golint
Merge pull request #48 from canaryio/golint

golint