Fix apache_configurator docs
Merge remote-tracking branch 'github/letsencrypt/master' into docs

Conflicts:
	letsencrypt/client/apache_configurator.py
script doc fix
Fix recent commits docs bugs
Fix missing whitespace in todo
Merge remote-tracking branch 'github/letsencrypt/master' into docs

Conflicts:
	letsencrypt/client/apache_configurator.py
Merge pull request #109 from kuba/docs

Docs
Fix doc mistakes
Merge remote-tracking branch 'github/letsencrypt/master' into pep8

Conflicts:
	letsencrypt/client/client.py
Fix redirect var flow