Added improved indentation handling.  Specifically it now handles the case 'var = someval if somecond' so that it doesn't try to indent the next line.