Add Python 3.6 and pytest-benchmark for testing

Author: Tyler Goodlet

tox.ini

@@ -1,19 +1,19 @@
 [tox]
-envlist=check,py{26,27,34,35,py}-pytest{28,29,30}
+envlist=check,py{26,27,34,35,36,py}-pytest{28,29,30}
 
 [testenv]
 commands= py.test {posargs:testing/}
 deps=
   pytest28: pytest~=2.8.0
   pytest29: pytest~=2.9.0
   pytest30: pytest~=3.0.0
-
+  pytest-benchmark
 
 [testenv:check]
 deps =
   flake8
-  restructuredtext_lint 
-commands = 
+  restructuredtext_lint
+commands =
   flake8 pluggy.py setup.py testing
   rst-lint CHANGELOG.rst README.rst
 
@@ -30,8 +30,8 @@ commands =
 [pytest]
 minversion=2.0
 #--pyargs --doctest-modules --ignore=.tox
-addopts= -rxsX 
+addopts= -rxsX
 norecursedirs = .tox ja .hg .env*
 
 [flake8]
-max-line-length = 99
+max-line-length = 99