Improve Soy indentation

This fixes the unindentation of `{else}` and similar. It also preserves the indentation in inner mode instead of enforcing the Soy indentation.
It's explained in the commit message 1c4593345e70b279f64c4532133e3354d6899256.