Un-indent for "else" after "for" and "try/except"

Fixes #21
Unindent 'finally' after 'else' too
clean up implementation

also fixes #7