Add new autoedit strategy for automatic indentation after keywords - see
#487
Reimplemented automatic indentation after keyword - fixes #487
Merge branch 'autoindent' into develop