Add Java support in Vim
Set smartindent for C and Java
Drop custom matchit install
Drop polyglot in Vim

Meh.
Use more aggressive = in Vim

Just format the whole file.
Use delmitMate for auto-closing in Vim