Address keybase/keybase-issues#220
Merge branch 'master' of github.com:keybase/node-client