Cleanup and additional indentation rules

    return now calls newline-and-indent
    braces should automatically be indented
    cases in switch statements should be indented