Fix formatting.
Add vimrc augroup; organize settings.