SSL support
Merge branch 'dev/ssl'

Conflicts:
	manifests/client.pp