Add matchindent.vim to guess indentation settings
Some cleanup.

Sorry to those of you downstream if it causes conflicts :/