Add testing and document support for Python 3.7 & pypy3
diff --git a/.travis.yml b/.travis.yml
index ea2ec21..34e455a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
+dist: xenial
 sudo: false
 language: python
 
 python:
+  - 3.7
   - 3.6
   - 3.5
   - 3.4
   - 2.7
-  - pypy
+  - pypy3.5-6.0
+  - pypy2.7-6.0
 
 env:
   - TOXENV=py,codecov
diff --git a/setup.py b/setup.py
index cc00133..52306c0 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
diff --git a/tox.ini b/tox.ini
index 6e68b0e..2ccac46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,35,34,27,py}
+    py{37,36,35,34,27,py3,py}
     docs-html
     coverage-report