vimrc: merge some useful updates from sjl