Switched back to show-trailing-whitespace in prog modes
Merge branch 'master' of https://github.com/thekondr/.emacs.d