Merge pull request #190 from jdufresne/pypy

Include PyPy in Travis testing
diff --git a/.travis.yml b/.travis.yml
index b18f021..493cfdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@
   - "3.6"
   - "3.5"
   - "3.4"
+  - "pypy"
 sudo: false # Use container-based infrastructure
 install:
   - "pip install mock"
diff --git a/setup.py b/setup.py
index 6541fd2..941c7c8 100644
--- a/setup.py
+++ b/setup.py
@@ -54,12 +54,15 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
+        'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Terminals',
     ]
 )