Added namedtuples for key, csr in client
Merge remote-tracking branch 'github/letsencrypt/master' into docs

Conflicts:
	letsencrypt/client/apache_configurator.py