Index: .travis.yml
===================================================================
--- .travis.yml	(revision 72ccc0887e379382e5289947610762cb40ca463a)
+++ .travis.yml	(revision eba7bad910cc55f14a829ace8eef2533d86d9c78)
@@ -1,54 +1,81 @@
+# Test Travis CL
+
 language: python
+
 matrix:
   include:
-  - os: linux
-    env:
-    - PY=2.7
-    - NUMPYSPEC=numpy
-  - os: osx
-    language: generic
-    env:
-    - PY=2.7
-    - NUMPYSPEC=numpy
+    - os: linux
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+    - os: osx
+      language: generic
+      env:
+        - PY=2.7
+        - NUMPYSPEC=numpy
+
+# whitelist
 branches:
   only:
-  - master
+    - master
+
 addons:
   apt:
     packages:
-    - opencl-headers
-    - fglrx
-    - libblas-dev
-    - libatlas-dev
-    - libatlas-base-dev
-    - liblapack-dev
-    - gfortran
-    - libhdf5-serial-dev
+      - opencl-headers
+      - fglrx
+      - libblas-dev
+      - libatlas-dev
+      - libatlas-base-dev
+      - liblapack-dev
+      - gfortran
+      - libhdf5-serial-dev
+
 before_install:
-- echo $TRAVIS_OS_NAME
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; sudo apt-get update; sudo apt-get install python-pyopencl; elif
-  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-  -O miniconda.sh; fi
-- bash miniconda.sh -b -p $HOME/miniconda
-- export PATH="$HOME/miniconda/bin:$PATH"
-- hash -r
-- conda update --yes conda
-- conda info -a
-- conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
+  - echo $TRAVIS_OS_NAME
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+        sudo apt-get update; sudo apt-get install python-pyopencl;
+    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
+    fi
+
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda update --yes conda
+
+  # Useful for debugging any issues with conda
+  - conda info -a
+
+  # could install other dependencies, but they're locked to specific
+  # versions in build/requirements.txt
+  - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
+
 install:
-- pip install -r build_tools/requirements.txt
-- pip install matplotlib
+  - pip install -r build_tools/requirements.txt
+  - pip install matplotlib
+
+#before_script:
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+#        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start
+#    fi
+
 script:
-- cd ..
-- export WORKSPACE=$(pwd)
-- git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
-- git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
-- ls -ltr
-- if [ ! -d "utils" ]; then mkdir utils; fi
-- /bin/sh -xe sasview/build_tools/travis_build.sh
-- export LC_ALL=en_US.UTF-8
-- export LANG=en_US.UTF-8
-notifications:
-  slack:
-    secure: JSjANbnt+zlf1h7a32k7gQ256x0aWxSZ5ngX2l8vcnOqPQdxzdIlaQ0Z17gC78+kGOyJZHxMvDGergXuqmRGgG5VObbDA8AI9gl9DZPczWFdRV/r/TOULwXY0vz+ZsoKgafS+waQSud9ps0de8elQo1eFQTHjWRLQuLlWeDuDzo=
+  - cd ..
+  # this should be the directory above the sasview directory, where we want to
+  # clone the sasmodels
+  - export WORKSPACE=$(pwd)
+  - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
+
+  # required for documentation
+  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
+
+  - ls -ltr
+  - if [ ! -d "utils" ]; then mkdir utils; fi
+  - /bin/sh -xe sasview/build_tools/travis_build.sh
+  - export LC_ALL=en_US.UTF-8
+  - export LANG=en_US.UTF-8
+#  - python setup.py docs; echo 0
+#  - python setup.py bdist_egg --skip-build
+
