diff --git a/.travis.yml b/.travis.yml
index 8bc8471..2713d76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
 matrix:
   include:
     - python: 3.3
-      env: DJANGO=1.3.5
+      env: DJANGO=1.3.5 DJANGO_SETTINGS_MODULE=twitter_tag.test_settings
 install:
   - pip install -q https://github.com/django/django/archive/${DJANGO}.zip#egg=django
   - pip install coveralls
diff --git a/AUTHORS b/AUTHORS
index 329ebdd..2b8f95c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,4 +2,5 @@ Created and maintained by Ilya Baryshev.
 
 Contributors:
 
-* Diederik van der Boor (vdboor)
\ No newline at end of file
+* Diederik van der Boor (vdboor)
+* Colin Wood (cwood)
\ No newline at end of file
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f525b3..875b6e8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@
 * Python 3 support
 * max_url_length argument is removed
 * better linkify for mentions and hashtags (ttp dependency removed)
+* better handling for not connecting or json decode errors
 
 1.0
 ===
diff --git a/README.rst b/README.rst
index c6d3498..eaea180 100644
--- a/README.rst
+++ b/README.rst
@@ -186,4 +186,4 @@ Tests
 
 Run::
 
-    python setup.py test
+    DJANGO_SETTINGS_MODULE = twitter_tag.test_settings python setup.py test