misc changes to vimrc, cleanup