fix mistake
Various cleaning and reorganising in vimrc