Fixes from golint and go vet.
Merge pull request #13 from cloudflare/kyle/golint

Fixes from golint and go vet.