Reorganized vimrc to use categories found in :options