edits before major update to OTR
Merge branch 'master' of https://github.com/m-n-/encryp.us
otr chat now uses json to update individual messages