Merge branch 'master' of github.com:kubernetes-incubator/client-python into release-1.0

Author: mbohlool

setup.py

@@ -55,7 +55,6 @@
     """,
     classifiers=[
         "Development Status :: %s" % DEVELOPMENT_STATUS,
-        "Environment :: Kubernetes",
         "Topic :: Utilities",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",