diff --git a/.gitignore b/.gitignore
index e06399ff4..ced995972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 *.egg-info
 build/
 dist/
+venv/
 m3
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb..000000000
diff --git a/README.md b/README.md
index b75818e60..ba789f2fd 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,27 @@ This is the Let's Encrypt Agent DEVELOPER PREVIEW repository.
 DO NOT RUN THIS CODE ON A PRODUCTION WEBSERVER.  IT WILL INSTALL CERTIFICATES
 SIGNED BY A TEST CA, AND WILL CAUSE CERT WARNINGS FOR USERS.
 
-This code intended for testing, demonstration, and integration engineering
+This code is intended for testing, demonstration, and integration engineering
 with OSes and hosting platforms.  Currently the code works with Linux and
 Apache, though we will be expanding it to other platforms.
 
 ## Running the demo code on Ubuntu
 
+<<<<<<< HEAD
 `sudo apt-get install python python-setuptools python-dev python-augeas gcc swig dialog libssl-dev`
 
 `python setup.py install --user`
 
 `sudo ./letsencrypt.py` (or `~/.local/bin/letsencrypt`)
+=======
+```
+sudo apt-get install python python-setuptools python-virtualenv \
+  python-dev python-augeas gcc swig dialog
+virtualenv --system-site-packages venv
+./venv/bin/python setup.py install
+sudo ./venv/bin/letsencrypt
+```
+>>>>>>> 45ef583a3cebca6159ca2e610b2d8cdd54e5ff6a
 
 Note, that letsencrypt does not yet handle Debian unstable's Apache2
 conf layout.
diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index 7fd363bd1..0788800b2 100755
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -9,7 +9,6 @@ import csv
 import requests
 
 from letsencrypt.client.acme import acme_object_validate
-from letsencrypt.client.sni_challenge import SNI_Challenge
 from letsencrypt.client import configurator, apache_configurator
 from letsencrypt.client import logger, display
 from letsencrypt.client import le_util, crypto_util