delete trailing whitespace
Merge branch 'master' of https://github.com/sgt/emacs.d