Merge pull request #209 from danw/multiline_indent

Improve indentation for multi-line expressions