Merge branch 'master' into configurator_tests

Conflicts:
	letsencrypt/client/apache/configurator.py
	setup.py

README.md

@@ -46,7 +46,7 @@ sudo apt-get install python python-setuptools python-virtualenv \
 ### Installation
 
 ```
-virtualenv --no-site-packages venv
+virtualenv --no-site-packages -p python2 venv
 ./venv/bin/python setup.py install
 sudo ./venv/bin/letsencrypt
 ```

letsencrypt/client/setup.sh

@@ -1,2 +1,2 @@
-#!/usr/bin/sh
+#!/bin/sh
 cp options-ssl.conf /etc/letsencrypt/options-ssl.conf