diff --git a/.gitignore b/.gitignore
index 330c5887..d588c219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,23 @@
-/.DS_Store
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# IDEs and editors
+/.idea
 /.vscode
+
+#System Files
+.DS_Store
+
+# Ignore everything in vendor/, except for *.go files,
+# LICENSE and COPYING. Ignore Go tests.
+# https://github.com/golang/dep/issues/120#issuecomment-306518546
+vendor/**/*
+!vendor/**/
+!vendor/**/*.go
+!vendor/**/*.c
+!vendor/**/*.cpp
+!vendor/**/*.s
+!vendor/**/COPYING*
+!vendor/**/PATENTS*
+!vendor/**/NOTICE*
+!vendor/**/LICENSE*
+vendor/**/*_test.go