diff --git a/.circleci/config.yml b/.circleci/config.yml
index 71a2a74f7..9ce276f41 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,9 +30,11 @@ jobs:
     docker:
       - image: supinf/gometalinter:latest
     working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
+    environment:
+      CGO_ENABLED: 0
     steps:
       - checkout
-      - run: gometalinter --deadline 60s --exclude=/usr/local/go/ --exclude ^vendor ./...
+      - run: gometalinter ./...
 
   deploy:
     executor: go
diff --git a/.gometalinter.json b/.gometalinter.json
new file mode 100644
index 000000000..1f271e081
--- /dev/null
+++ b/.gometalinter.json
@@ -0,0 +1,34 @@
+{
+  "Vendor": true,
+  "Deadline": "5m",
+  "Concurrency": 2,
+  "Linters": {
+    "gofmt": {"Command": "gofmt -l -s -w"},
+    "goimports": {"Command": "goimports -l -w"}
+  },
+
+  "Enable": [
+    "deadcode",
+    "errcheck",
+    "gas",
+    "goconst",
+    "gocyclo",
+    "gofmt",
+    "goimports",
+    "golint",
+    "gosimple",
+    "gotype",
+    "gotypex",
+    "ineffassign",
+    "interfacer",
+    "megacheck",
+    "misspell",
+    "nakedret",
+    "structcheck",
+    "unconvert",
+    "unparam",
+    "varcheck",
+    "vet",
+    "vetshadow"
+  ]
+}
diff --git a/cmd/root.go b/cmd/root.go
index 0203001e8..3b412f752 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -60,7 +60,7 @@ func MakeCommands() *cobra.Command {
 	// https://github.com/spf13/cobra/issues/340
 	// If you expose a command with `RunE`, and return an error from your
 	// command, then Cobra will print the error message, followed by the usage
-	// infomation for the command. This makes it really difficult to see what's
+	// information for the command. This makes it really difficult to see what's
 	// gone wrong. It usually prints a one line error message followed by 15
 	// lines of usage information.
 	// This flag disables that behaviour, so that if a comment fails, it prints