Clean-up vimrc (ish) and remove 'set shell' line that broke everything