Use gvim/MacVim again; update shell config