client: Improve user interaction

Change test of message so that it reflects that we have not yet connected

Provide instruction on how to quit.
Merge branch 'master' into srobertson

Conflicts:
	client/client.go