Merge pull request #479 from n8fr8/master

Fixes for account setup and OTR verification
formatting
13.2.0-alpha-9a