diff --git a/.gitignore b/.gitignore
index a9377f133c..41e9026dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,47 +1,21 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
+*.attr
+*.exe
+*.log
+*.old
+*.swp
+*.test
 .DS_Store
 Thumbs.db
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-/pkg
-*.exe
-*.test
-bin/
 .vagrant/
+/pkg
+bin/
+ui/.bundle
+ui/.sass-cache
+ui/dist/
+ui/static/application.min.js
+ui/static/base.css
+ui/vendor
+website/.bundle
 website/build/
 website/npm-debug.log
-*.old
-*.attr
-*.log
-
-ui/.sass-cache
-ui/static/base.css
-
-ui/static/application.min.js
-ui/dist/
-
-*.swp
-
-website/.bundle
 website/vendor
-
-ui/.bundle
-ui/vendor