Clean up vimrc with better groupings