Merge branch 'master' into documentation

Author: pkittenis

setup.py

@@ -9,4 +9,16 @@
       url = "https://github.com/pkittenis/parallel-ssh",
       py_modules = ['pssh'],
       install_requires = ['paramiko', 'gevent'],
+      classifiers = [
+        'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
+        'Intended Audience :: Developers',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Utilities',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: POSIX :: Unix',
+        'Operating System :: POSIX :: BSD',
+        'Operating System :: Windows',
+        ],
       )