diff --git a/.editorconfig b/.editorconfig
index 1656a6d5d1889155d2f77e5bc4eda680b2a4f5da..cc21b0460426258f76c1f9d66b01b4d42fc745cf 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,19 @@
-#https://EditorConfig.org
+# https://EditorConfig.org
+
 # top-most EditorConfig file
 root=true
 
+# Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
 insert_final_newline = true
+
+# 2 space indentation
 indent_style = space
 indent_size = 2
+
+# Avoid issues parsing cookbook files later
 charset = utf-8
+
+# Avoid cookstyle warnings
 trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index e085291b92b2b6bd105164454185217ee99d8112..be3b9a8bc3c8434a3217bbf94d163b4906287da2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 *.rbc
 .config
-coverage
 InstalledFiles
-lib/bundler/man
 pkg
-rdoc
-spec/reports
 test/tmp
 test/version_tmp
 tmp
@@ -14,27 +10,32 @@ _Store
 *#
 .#*
 \#*#
-.*.sw[a-z]
 *.un~
 *.tmp
 *.bk
 *.bkup
 
-# ruby/bundler files
+# editor files
+.idea
+.*.sw[a-z]
+
+# ruby/bundler/rspec files
 .ruby-version
 .ruby-gemset
 .rvmrc
 Gemfile.lock
 .bundle
 *.gem
+coverage
+spec/reports
 
-# YARD artifacts
+# YARD / rdoc artifacts
 .yardoc
 _yardoc
 doc/
-.idea
+rdoc
 
-# chef stuff
+# chef infra stuff
 Berksfile.lock
 .kitchen
 kitchen.local.yml
diff --git a/.yamllint b/.yamllint
index ecfdffb850a2e3e3c866daec5c531ab91e3cead1..2d6961285e23241295bd81b34025a100313b141e 100644
--- a/.yamllint
+++ b/.yamllint
@@ -4,3 +4,4 @@ rules:
   line-length:
     max: 256
     level: warning
+  document-start: disable