diff --git a/.travis.yml b/.travis.yml
index dc81a35c1368efbf03e832bce6adf9cc2d9863a8..3f16b07fadd0b3f057eb44809c6419a338094deb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,13 @@ go:
   - 1.6.2
   - tip
 
+before_install:
+  - go get -v github.com/golang/lint/golint
+
 sudo: false
 script:
   - go build -v ./...
   - go list ./... |grep -v vendor/ |xargs go test
   - gofmt -d $(find -type f -name '*.go' -not -path './vendor/*')
   - go list ./... |grep -v vendor/ |xargs go vet
+  - go list ./... |grep -v vendor/ |xargs -L1 golint
diff --git a/server/auth/github/github.go b/server/auth/github/github.go
index 7904e2623144d778afd7234bd28402204c90ed57..9bbd8f62e40aa676f3f630a8bf9314e2ba0608e0 100644
--- a/server/auth/github/github.go
+++ b/server/auth/github/github.go
@@ -67,9 +67,9 @@ func (c *Config) Valid(token *oauth2.Token) bool {
 	return member
 }
 
-// GitHub doesn't seem to allow token revocation - tokens are indefinite and
-// there are no refresh options etc. Returns nil to satisfy the Provider
-// interface.
+// Revoke is a no-op revoke method. GitHub doesn't seem to allow token
+// revocation - tokens are indefinite and there are no refresh options etc.
+// Returns nil to satisfy the Provider interface.
 func (c *Config) Revoke(token *oauth2.Token) error {
 	return nil
 }
diff --git a/server/fs/s3.go b/server/fs/s3.go
index 4e82bb49be8d10b65ccdb36e9c7ae71f3047c954..e16e7d6fd91a9a08853e6249af44ab64686da5ad 100644
--- a/server/fs/s3.go
+++ b/server/fs/s3.go
@@ -19,6 +19,7 @@ import (
 	"github.com/nsheridan/cashier/server/config"
 )
 
+// Register the /s3/ filesystem as a well-known filesystem.
 func Register(config *config.AWS) {
 	ac := &aws.Config{}
 	// If region is unset the SDK will attempt to read the region from the environment.
diff --git a/templates/token.go b/templates/token.go
index dbad371f6bfcc840676e8100fc8dcdf3f15b4342..270055b26285c5de6840df1659a6c94daffbc620 100644
--- a/templates/token.go
+++ b/templates/token.go
@@ -1,5 +1,6 @@
 package templates
 
+// Token is the page users see when authenticated.
 const Token = `<html>
   <head>
     <title>YOUR TOKEN!</title>