Merge pull request #25 from graingert/patch-2

Add Python 3.5 to travis
diff --git a/.travis.yml b/.travis.yml
index a1ea020..64b4bc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
 matrix:
   include:
diff --git a/setup.py b/setup.py
index 419cab8..04882e6 100755
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
     'Operating System :: POSIX',
     'Topic :: Internet :: WWW/HTTP',
     'Topic :: Software Development :: Libraries :: Python Modules',