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.