checkpoint
Merge branch 'master' of github.com:keybase/messenger-client
merge conflicts ahead...