diff --git a/.gitignore b/.gitignore
index c2960b07..231d027f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,29 @@
-*.gem
-*.swp
-*~
-.DS_Store
-.analysis
+# Jekyll
+_site/
+.jekyll-cache
+.jekyll-metadata
+.sass-cache
+
+# Ruby
 .bundle/
 .byebug_history
-.jekyll-metadata
 .ruby-gemset
 .ruby-version
-.sass-cache
-/test/source/file_name.txt
-/vendor
+*.gem
 Gemfile.lock
-_site/
-bin/
+
+# Files
+.analysis
+.DS_Store
+*.swp
+*~
+
+# Folders
+/vendor
 bbin/
+bin/
 coverage
 gh-pages/
 pkg/
-site/_site/
 test/dest
 tmp/*
diff --git a/docs/.gitignore b/docs/.gitignore
index 527980f3..ab6b6662 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,5 +1,5 @@
 _site/
+.idea/
 *.swp
 pkg/
 test/
-.idea/
\ No newline at end of file