Change setup for move to Ring 3
Tidy up vimrc post solarized switchover