re-added autoindent

indenting has been wonky.  maybe another setting is messing with it...
Merge branch 'indent-bugfix'