Use py35, reorder tox and travis

.travis.yml

@@ -6,15 +6,14 @@ addons:
     packages:
     - redis-server
 
-matrix:
-  # major versions, test first
-  include:
-    - env: TOXENV=py27
-    - env: TOXENV=py35-dev
-      python: "3.5-dev"
+# matrix:
+#   # major versions, test first
+#   include:
+#     - env: TOXENV=py35
+#       python: "3.5"
 env:
-  # - TOXENV=py27
-  # - TOXENV=py35-dev
+  - TOXENV=py27
+  - TOXENV=py35
   # other versions
   - TOXENV=py26
   - TOXENV=py33

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py{26,27,34,35}
+envlist = py{26,27,34,35,py}
 
 [testenv]
 deps = pytest
@@ -10,6 +10,3 @@ passenv = PYTEST_STATUS_PORT
 
 commands = pip install .
         py.test -v
-
-[testenv:py35-dev]
-basepython = python3.5-dev