Merge branch 'master' into 'master'

Reverting to python 3.5 for the moment See merge request !16

Merge branch 'master' into 'master'
Reverting to python 3.5 for the moment See merge request !16
515205ed · Paul McCarthy · afddbe1c · ad7f8546 · 515205ed
Commit 515205ed authored May 27, 2017 by Paul McCarthy 🚵
--- a/setup.py
+++ b/setup.py
@@ -97,7 +97,7 @@ setup(
        'Intended Audience :: Developers',
        'License :: OSI Approved :: Apache Software License',
        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.5',
        'Topic :: Software Development :: Libraries :: Python Modules'],

    packages=packages,