Make a note about char escaping, re #321
Fixed merge conflict on README.md