Updated indentation rules.

I took maxlevesque changes to the indentation rules and added several of my own. This should fix just about all the indentations rules. The only rule that I know won't work correctly are single line where statements such as

    where (x < 1) x = 2

which will still have the indentation increase after it.