Clean up .vimrc, add sections and comments