Go 1.0 needs return statements.
cli.go uses the TPM-related message strings.

Needed when building with -tags nogui.
Merge branch 'ln5-fixes'