Merge pull request swiftlang#192 from google/format-control-flows

Refactor indentation of control flow statements.

Author: dabelknap