Merge branch 'SylvainDe-master'

Author: Byron

.travis.yml

@@ -5,10 +5,16 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "3.6-dev"
+  - "3.7-dev"
+  - "nightly"
   # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
-#matrix:
-#  allow_failures:
-#    - python: "2.6"
+matrix:
+  allow_failures:
+    - python: "3.6-dev"
+    - python: "3.7-dev"
+    - python: "nightly"
 git:
   # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
   # as we clone our own repository in the process