Merge branch 'python-3.5' into 'master'

Update .travis.yml for Python 3.5



See merge request !40

.travis.yml

@@ -9,13 +9,23 @@ notifications:
   on_success: change
   on_failure: always
 
-env:
-  matrix:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py32
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=pypy
-  - TOXENV=py27-flake8
-  - TOXENV=py34-flake8
+matrix:
+  include:
+    - python: 2.6
+      env: TOXENV=py26
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.2
+      env: TOXENV=py32
+    - python: 3.3
+      env: TOXENV=py33
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - python: pypy
+      env: TOXENV=pypy
+    - python: 2.7
+      env: TOXENV=py27-flake8
+    - python: 3.4
+      env: TOXENV=py34-flake8