Fix docblock parsing to handle `\r\n`

Should fix #229, but I haven't actually tested.

This stuff has also been changing upstream, so I'd like to either get this upstream and not diverge, or just fork it a bit more formally. Let's not merge quite yet...