vim: Don't conceal anything, ever.
ditch: Fix some regex and tidy up a bit