better callbacks for generating keys
Merge branch 'master' of github.com:ChatSecure/OTRKit