Include pytest 3.6 into the build matrix

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
-  py{27,34,35,36}-pytest{30,31,32,33}
-  py{27,36}-pytest{30,31,32,33}-pexpect
+  py{27,34,35,36}-pytest{30,31,32,33,36}
+  py{27,36}-pytest{30,36}-pexpect
   py{27,36}-pytest{master,features}
   flakes
   readme
@@ -19,6 +19,7 @@ deps =
   pytest31: pytest~=3.1.0
   pytest32: pytest~=3.2.0
   pytest33: pytest~=3.3.0
+  pytest36: pytest~=3.6.0
   pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
   pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
   pexpect: pexpect