Clean up vimrc, minor updates