Vim now removes trailing whitespace with <Leader>w.
Merge branch 'master' into emacs