diff --git a/.aspell.en.pws b/.aspell.en.pws
index e0bb31be1879628074dfe06eea2b7c40b0413e67..ea4ffb62626a57dc247407434c4d897483373848 100644
--- a/.aspell.en.pws
+++ b/.aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 158 
+personal_ws-1.1 en 158
 cfg
 runtime
 Nginx
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 0d19da4e4909b27f1248076c67611cb72259f56b..ea3a3a4c208308867ce7a26dc6f5421ba54e3500 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -4,7 +4,7 @@
 # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
-# 
+#
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_TEMPLATES_DIR="$HOME/Templates"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed4a5c287d32572006c2f6613a1dc0d721687151..b5936d134d99a94372342d67ee932a70879bd673 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,7 @@ repos:
     -   id: check-merge-conflict
     -   id: check-symlinks
     -   id: detect-private-key
+    -   id: trailing-whitespace
     -   id: flake8
         exclude: pythonrc.py
 -   repo: https://www.shore.co.il/git/shell-pre-commit/
diff --git a/Makefile b/Makefile
index 400cdf87b770b129f8245bc5122927abcf138851..19ad86be585f49f302f46e500eae6d5ecc3cc734 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,13 @@ download = curl --silent --location --fail --output $@
 
 all: .config/pythonrc.py .ssh/config .bash_completion.d/aws .bash_completion.d/docker-compose .bash_completion.d/docker-machine.bash .bash_completion.d/docker-machine.bash .travis/travis.sh binaries
 
-binaries: .local/share/bfg/bfg.jar .local/bin/rke .local/bin/docker-machine .local/bin/packer .local/bin/terraform .local/bin/vault .local/bin/kubectl .local/bin/kops .local/bin/kompose .local/bin/minikube 
+binaries: .local/share/bfg/bfg.jar .local/bin/rke .local/bin/docker-machine .local/bin/packer .local/bin/terraform .local/bin/vault .local/bin/kubectl .local/bin/kops .local/bin/kompose .local/bin/minikube
 
 .ssh/config: $(ssh_configs)
 	find ".ssh/config.d/" -type f \! -name '.*' -print0 | sort --zero | xargs -0 cat > ".ssh/config"
 
 .bash_completion.d/docker-compose:
-	$(download) https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/bash/docker-compose 
+	$(download) https://raw.githubusercontent.com/docker/compose/1.23.2/contrib/completion/bash/docker-compose
 
 .bash_completion.d/docker-machine.bash:
 	$(download) https://raw.githubusercontent.com/docker/machine/v0.16.0/contrib/completion/bash/docker-machine.bash