Merge pull request #70 from benvanwerkhoven/fix_travis

allow python 3.5 to fail until conda recipe for scipy is fixed

Author: benvanwerkhoven

.travis.yml

@@ -9,12 +9,6 @@ matrix:
       env:
         - MCONDA_PYTHON_MAJOR=2
         - MCONDA_PYTHON_VERSION=2.7
-
-    - os: linux
-      env:
-        - MCONDA_PYTHON_MAJOR=3
-        - MCONDA_PYTHON_VERSION=3.5
-
     - os: linux
       env:
         - MCONDA_PYTHON_MAJOR=3
@@ -24,12 +18,6 @@ matrix:
       env:
         - MCONDA_PYTHON_MAJOR=2
         - MCONDA_PYTHON_VERSION=2.7
-
-    - os: osx
-      env:
-        - MCONDA_PYTHON_MAJOR=3
-        - MCONDA_PYTHON_VERSION=3.5
-
     - os: osx
       env:
         - MCONDA_PYTHON_MAJOR=3