Fix on wrote line and tests and bump version

The main point of this pull request is to fix the handling of On ... wrote lines that span multiple lines.   I found a few tests were broken too though, and went ahead and fixed those.