Fixes for brace matching and indentation changes

* the indentaiton and brace matching functionality seems to be much
improved - hopefully we can now enable the brace completion
functionality in addition to the automatic indentation support