a few hack
Merge branch 'master' of github.com:keybase/go-libkb

Conflicts:
	keygen.go