Handle embedded newlines in C strings correctly
Work around weird conceal rendering quirk
Wrap the 'paste' dance
Merge branch master into guns