Minor updates to vimrc and vim/bundle