diff --git a/.travis.yml b/.travis.yml
index 9a3e0617..075a38e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ fast_finish: true
 python:
   - 2.7
   - 3.4
+  - 3.5
 env:
   global:
     # 1. Generated a token for travis at https://anaconda.org/quantopian/settings/access with scope api:write.
@@ -33,11 +34,23 @@ install:
   - conda install conda=4.1.11 conda-build=1.21.11 anaconda-client=1.5.1 --yes
 
   - TALIB_VERSION=$(cat ./etc/requirements_talib.txt | sed "s/TA-Lib==\(.*\)/\1/")
-  - conda create -n testenv --yes -c quantopian pip python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION libgfortran=3.0 ta-lib=$TALIB_VERSION
-  - source activate testenv
   - IFS='.' read -r -a NPY_VERSION_ARR <<< "$NUMPY_VERSION"
   - CONDA_NPY=${NPY_VERSION_ARR[0]}${NPY_VERSION_ARR[1]}
   - CONDA_PY=$TRAVIS_PYTHON_VERSION
+
+  - if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" && "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then DO_UPLOAD="true"; else DO_UPLOAD="false"; fi
+  - |
+    for recipe in $(ls -d conda/*/ | xargs -I {} basename {}); do
+      if [[ "$recipe" = "zipline" ]]; then continue; fi
+
+      conda build conda/$recipe --python=$CONDA_PY --numpy=$CONDA_NPY --skip-existing -c quantopian -c https://conda.anaconda.org/quantopian/label/ci
+      RECIPE_OUTPUT=$(conda build conda/$recipe --python=$CONDA_PY --numpy=$CONDA_NPY --output)
+      if [[ -f "$RECIPE_OUTPUT" && "$DO_UPLOAD" = "true" ]]; then anaconda -t $ANACONDA_TOKEN upload "$RECIPE_OUTPUT" -u quantopian --label ci; fi
+    done
+
+  - conda create -n testenv --use-local --yes -c quantopian pip python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION libgfortran=3.0 ta-lib=$TALIB_VERSION
+  - source activate testenv
+
   - CACHE_DIR="$HOME/.cache/.pip/pip_np""$CONDA_NPY"
   - pip install --upgrade pip coverage coveralls --cache-dir=$CACHE_DIR
   - pip install -r etc/requirements.txt --cache-dir=$CACHE_DIR
@@ -52,15 +65,6 @@ script:
   - nosetests --with-coverage
   # deactive env to get access to anaconda command
   - source deactivate
-  - if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" && "$TRAVIS_BRANCH" = "master" && "$TRAVIS_PULL_REQUEST" = "false" ]]; then DO_UPLOAD="true"; else DO_UPLOAD="false"; fi
-  - |
-    for recipe in $(ls -d conda/*/ | xargs -I {} basename {}); do
-      if [[ "$recipe" = "zipline" ]]; then continue; fi
-
-      conda build conda/$recipe --python=$CONDA_PY --numpy=$CONDA_NPY --skip-existing -c quantopian -c https://conda.anaconda.org/quantopian/label/ci
-      RECIPE_OUTPUT=$(conda build conda/$recipe --python=$CONDA_PY --numpy=$CONDA_NPY --output)
-      if [[ -f "$RECIPE_OUTPUT" && "$DO_UPLOAD" = "true" ]]; then anaconda -t $ANACONDA_TOKEN upload "$RECIPE_OUTPUT" -u quantopian --label ci; fi
-    done
 
   # unshallow the clone so the conda build can clone it.
   - git fetch --unshallow
diff --git a/appveyor.yml b/appveyor.yml
index b807f994..bdaefac7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,6 +31,12 @@ environment:
       NUMPY_VERSION: "1.11.1"
       SCIPY_VERSION: "0.17.1"
 
+    - PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "64"
+      PANDAS_VERSION: "0.18.1"
+      NUMPY_VERSION: "1.11.1"
+      SCIPY_VERSION: "0.17.1"
+
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
 platform:
diff --git a/conda/setuptools_scm/bld.bat b/conda/1_setuptools_scm/bld.bat
similarity index 100%
rename from conda/setuptools_scm/bld.bat
rename to conda/1_setuptools_scm/bld.bat
diff --git a/conda/setuptools_scm/build.sh b/conda/1_setuptools_scm/build.sh
similarity index 100%
rename from conda/setuptools_scm/build.sh
rename to conda/1_setuptools_scm/build.sh
diff --git a/conda/setuptools_scm/meta.yaml b/conda/1_setuptools_scm/meta.yaml
similarity index 100%
rename from conda/setuptools_scm/meta.yaml
rename to conda/1_setuptools_scm/meta.yaml
diff --git a/conda/bcolz/meta.yaml b/conda/bcolz/meta.yaml
index 5e81384d..6ab05f8f 100644
--- a/conda/bcolz/meta.yaml
+++ b/conda/bcolz/meta.yaml
@@ -32,7 +32,7 @@ requirements:
     - setuptools >18.0
     - numpy x.x
     - setuptools_scm >1.5.4
-    - cython ==0.22.1
+    - cython ==0.25.2
 
   run:
     - python
diff --git a/etc/goodies.txt b/etc/goodies.txt
index 4a5bb8ab..f472c3ae 100644
--- a/etc/goodies.txt
+++ b/etc/goodies.txt
@@ -1,6 +1,6 @@
 # Extra modules, goodies for algorithms.
 
-matplotlib==1.3.0
+matplotlib==1.5.3
 scipy==0.12.0
 scikit-learn==0.13.1
 statsmodels==0.5.0
diff --git a/etc/requirements.txt b/etc/requirements.txt
index 40186151..d05d16e4 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -29,7 +29,7 @@ six==1.10.0
 # For fetching remote data
 requests==2.9.1
 
-Cython==0.22.1
+Cython==0.25.2
 
 # faster OrderedDict
 cyordereddict==0.2.2
diff --git a/etc/requirements_dev.txt b/etc/requirements_dev.txt
index dff67111..53e56d9c 100644
--- a/etc/requirements_dev.txt
+++ b/etc/requirements_dev.txt
@@ -44,11 +44,11 @@ mistune==0.7
 backports.ssl-match-hostname==3.4.0.2;python_version<'3.0'
 certifi==2015.4.28
 
-# tornado and pyparsing are required by matplotlib
+# matplotlib dependencies:
 tornado==4.2.1
 pyparsing==2.0.3
-
-matplotlib==1.4.3
+cycler==0.10.0
+matplotlib==1.5.3
 
 Markdown==2.6.2