Reorganised vimrc.
More vimrc changes