Deactivate virtualenv before activating conda env

Author: takluyver

.travis.yml

@@ -8,6 +8,7 @@ sudo: false
 before_install:
   # We do this conditionally because it saves us some downloading if the
   # version is the same.
+  - deactivate  # Deactivate virtualenv
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
     else