Updates to fish, vimrc