clean up vimrc and add some fish config stuff