diff --git a/.travis_install.sh b/.travis_install.sh
deleted file mode 100755
index c4f43a50b..000000000
--- a/.travis_install.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]; then
-    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-else
-    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-fi
-
-bash miniconda.sh -b -p $HOME/miniconda
-export PATH="$HOME/miniconda/bin:$PATH"
-hash -r
-conda config --set always_yes yes --set changeps1 no
-conda update -q conda
-conda info -a
-
-if [ "${LATEST}" = "true" ]; then
-    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy pandas scikit-learn
-else
-    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION pandas=$PANDAS_VERSION scikit-learn=$SKLEARN_VERSION
-fi
-
-source activate test-environment
-
-conda install jupyter matplotlib
-pip install nose
-
-if [ "${COVERAGE}" = "true" ]; then
-    pip install coverage coveralls codecov
-fi
-
-python --version
-python -c "import pandas; print('pandas %s' % pandas.__version__)"
-python -c "import numpy; print('numpy %s' % numpy.__version__)"
-python -c "import scipy; print('scipy %s' % scipy.__version__)"
-python -c "import sklearn; print('sklearn %s' % sklearn.__version__)"
-
-
-
-
-python setup.py install;
diff --git a/.travis_test.sh b/.travis_test.sh
deleted file mode 100755
index 86942c663..000000000
--- a/.travis_test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-
-if [[ "$COVERAGE" == "true" ]]; then
-    nosetests -s -v --with-coverage
-else
-	nosetests -s -v
-fi
-
-if [[ "$NOTEBOOKS" == "true" ]]; then
-    cd docs
-    python make_api.py
-    find sources -name "*.ipynb" -exec jupyter nbconvert --to notebook --execute {} \;
-fi
diff --git a/ci/.travis_install.sh b/ci/.travis_install.sh
index c87dc86af..c4f43a50b 100755
--- a/ci/.travis_install.sh
+++ b/ci/.travis_install.sh
@@ -3,9 +3,9 @@
 set -e
 
 if [ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]; then
-    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+    wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
 else
-    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+    wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 fi
 
 bash miniconda.sh -b -p $HOME/miniconda
@@ -16,28 +16,27 @@ conda update -q conda
 conda info -a
 
 if [ "${LATEST}" = "true" ]; then
-    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy pandas scikit-learn;
+    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy pandas scikit-learn
 else
-    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION pandas=$PANDAS_VERSION scikit-learn=$SKLEARN_VERSION;
+    conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION pandas=$PANDAS_VERSION scikit-learn=$SKLEARN_VERSION
 fi
 
 source activate test-environment
 
-pip install nose;
+conda install jupyter matplotlib
+pip install nose
 
 if [ "${COVERAGE}" = "true" ]; then
-    pip install coverage coveralls codecov;
+    pip install coverage coveralls codecov
 fi
 
 python --version
-python -c "import pandas; print('pandas %s' % pandas.__version__)";
+python -c "import pandas; print('pandas %s' % pandas.__version__)"
 python -c "import numpy; print('numpy %s' % numpy.__version__)"
 python -c "import scipy; print('scipy %s' % scipy.__version__)"
-python -c "import sklearn; print('sklearn %s' % sklearn.__version__)";
+python -c "import sklearn; print('sklearn %s' % sklearn.__version__)"
+
 
 
-if [ "${NOTEBOOKS}" = "true" ]; then
-    conda install jupyter matplotlib
-fi
 
 python setup.py install;
diff --git a/ci/.travis_test.sh b/ci/.travis_test.sh
index c1ed56244..86942c663 100755
--- a/ci/.travis_test.sh
+++ b/ci/.travis_test.sh
@@ -5,6 +5,8 @@ set -e
 
 if [[ "$COVERAGE" == "true" ]]; then
     nosetests -s -v --with-coverage
+else
+	nosetests -s -v
 fi
 
 if [[ "$NOTEBOOKS" == "true" ]]; then