Removes redundant "-general" suffix in testenv names

Author: rszalski

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = {py26,py27,py33,py34,py35,py36}-general
-          {py26,py27,py33,py34,py35,py36}-general-{oldest,cryptography14,requests26,protobuf30}
+envlist = py26,py27,py33,py34,py35,py36
+          {py26,py27,py33,py34,py35,py36}-{oldest,cryptography14,requests26,protobuf30}
           py36-macOS
           py36-macOS-{oldest,cryptography14,requests26,protobuf30}
 skip_missing_interpreters = True
@@ -16,20 +16,20 @@ deps = future011,oldest: future==0.11.0
        future013: future>=0.13,<0.14
        requests26: requests>=2.6,<2.7
 
-[testenv:py36-general]
+[testenv:py36]
 platform  = win32|linux2|linux|cygwin
 
-[testenv:py36-general-oldest]
-platform = {[testenv:py36-general]platform}
+[testenv:py36-oldest]
+platform = {[testenv:py36]platform}
 
-[testenv:py36-general-requests26]
-platform = {[testenv:py36-general]platform}
+[testenv:py36-requests26]
+platform = {[testenv:py36]platform}
 
-[testenv:py36-general-cryptography14]
-platform = {[testenv:py36-general]platform}
+[testenv:py36-cryptography14]
+platform = {[testenv:py36]platform}
 
-[testenv:py36-general-protobuf30]
-platform = {[testenv:py36-general]platform}
+[testenv:py36-protobuf30]
+platform = {[testenv:py36]platform}
 
 [testenv:macOS]
 ; On macOS and Python versions where there aren't any binary wheels for `cryptography` yet