a triviality
Merge branch 'master' of github.com:keybase/go-client

Conflicts:
	cmd_login.go