diff --git a/.gitignore b/.gitignore
index 470189556..3c5e1474c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,6 @@ experimental/_integration/_integration
 *npm-debug.log
 app/static.go
 prog/static.go
-vendor/github.com/2opremio/go-1/codec/codecgen/codecgen
+vendor/github.com/ugorji/go/codec/codecgen/codecgen
 *.codecgen.go
 *.generated.go
diff --git a/tools/lint b/tools/lint
index a2c405797..22db070c0 100755
--- a/tools/lint
+++ b/tools/lint
@@ -85,7 +85,7 @@ function lint_go {
 		if [ -z "$IGNORE_LINT_COMMENT"  ]; then
 			lintoutput=$(golint "${filename}")
 		else
-			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports')
+			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports|ALL_CAPS')
 		fi
 		if [ -n "$lintoutput" ]; then
 			lint_result=1
@@ -148,7 +148,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/client/node_modules/)'
+		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
 	else
 		git diff --cached --name-only
 	fi