conflict?
Merge branch 'master' of github.com:keybase/go-triplesec

Conflicts:
	triplesec.go