Sync zenburn.vim with upstream