Major renovations and organization of .vimrc