* add client keys
Merge branch 'clientkeys'

Conflicts:
	manifests/client.pp
	manifests/server.pp