Add CI and docs for Python 3.6
diff --git a/.travis.yml b/.travis.yml
index 9300aae..d5e636d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@
         PYTHON_VERSION=2.7
         PLATFORM=osx
     - os: osx
-      python: "3.5"
+      python: "3.6"
       env:
-        PYTHON_VERSION=3.5
+        PYTHON_VERSION=3.6
         PLATFORM=osx
     - os: osx
       python: "pypy"
@@ -63,6 +63,12 @@
         PLATFORM=linux
     - os: linux
       language: python
+      python: "3.6"
+      env:
+        PYTHON_VERSION=3.6
+        PLATFORM=linux
+    - os: linux
+      language: python
       python: "pypy"
       env:
         PYTHON_VERSION=pypy
@@ -75,7 +81,7 @@
             /usr/local/bin/pip_pypy install flake8 coverage;
             export PYTHON_BIN=/usr/local/bin/pypy;
         else
-            if [ "$PYTHON_VERSION" == "3.5" ]; then
+            if [ "$PYTHON_VERSION" == "3.6" ]; then
                 brew update;
                 brew install python3;
                 /usr/local/bin/pip3 install flake8 coverage;
diff --git a/readme.md b/readme.md
index f482e9e..3be8d2b 100644
--- a/readme.md
+++ b/readme.md
@@ -113,7 +113,7 @@
 
 ## Dependencies
 
-Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 or pypy. *No third-party packages
+Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5, 3.6 or pypy. *No third-party packages
 required.*
 
 ## Installation
diff --git a/setup.py b/setup.py
index c6f8759..66a779c 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy',
 
         'Topic :: Security :: Cryptography',