Add trim_heredoc and re-indented output
Merge branch 'output-indentation'