Strip '\r' if present so we can correctly read <ditaa>
Fixes issue where ditaa tags made in wintendo where not found

Merge branch 'strip-wintendo-chars'