reorganize vimrc, try to get trailing whitespace removal right again