Merge remote-tracking branch 'brendon/newlines_bug'
make add_role, add_note tests more clear
transform \r\n into \n in #encode_text, to eliminate Windows newlines
resolved conflicts