Update travis to test against conda canary

.travis.yml

@@ -5,19 +5,16 @@ matrix:
       os: linux
     - python: '3.5'
       os: linux
-#    - python: '3.5'
-#      env: CANARY=true
-#      os: linux
+    - python: '3.5'
+      env: CANARY=true
+      os: linux
     - python: '3.5'
       env: CONDA=4.1
       os: linux
     - python: '3.5'
       env:
         - FLAKE8=true
       os: linux
-    - python: '3.5'
-      env: CONDA_MASTER=true
-      os: linux
 
 install:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
@@ -38,17 +35,6 @@ install:
       if [ -n "$CONDA" ]; then
         conda install -y --no-deps conda=${CONDA};
       fi
-
-      if [[ "$CONDA_MASTER" == "true" ]]; then
-        git clone https://github.com/conda/conda.git;
-        pushd conda;
-        python setup.py install;
-        hash -r;
-        conda info;
-        popd;
-      fi
-    fi
-
   - conda install -q anaconda-client requests=2.11.1 filelock contextlib2 jinja2 patchelf python=$TRAVIS_PYTHON_VERSION pyflakes=1.1 conda-verify
   - pip install pkginfo
   - if [[ "$FLAKE8" == "true" ]]; then