cleanup .travis.yml somewhat

.travis.yml

@@ -3,9 +3,6 @@ python:
   - "2.7"
   - "3.4"
 #  - "3.3"
-#env: #Doesn't seem to work terribly well
-#  - CC=gcc
-#  - CC=clang LDSHARED=clang
 env: #split tests
    - NOSE_IGNORE_FILES='test_qdf|test_pv2qdf|test_diskdf|test_orbit|test_streamdf|test_evolveddiskdf|test_nemo'
    - NOSE_IGNORE_FILES='^((?!test_orbit).)*$'
@@ -14,8 +11,6 @@ env: #split tests
    - NOSE_IGNORE_FILES='^((?!test_qdf).)*$'
    - NOSE_IGNORE_FILES='^((?!test_pv2qdf).)*$'
    - NOSE_IGNORE_FILES='^((?!test_streamdf).)*$'
-#virtualenv:
-#  system_site_packages: true
 before_install:
  - sudo apt-get update
  - sudo apt-get install libgsl0-dev
@@ -29,12 +24,6 @@ before_install:
  - conda update -q conda
  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib setuptools pip
  - source activate test-environment
-# - pip uninstall -y numpy #uninstall numpy from virtualenv
-# - sudo dpkg -r --force-depends python-numpy #because this is 1.6.1
-# - sudo dpkg -r --force-depends python-scipy #because this is old
-# - pip install numpy>=1.7
-# - pip install -v scipy>=0.14
-# - sudo apt-get install -qq python-matplotlib
  - export DISPLAY=:99.0 #For plotting tests, courtesy Ryan Varley
  - sh -e /etc/init.d/xvfb start $For plotting tests
 #Download corrections for some tests
@@ -57,7 +46,6 @@ after_success:
  # combine, generate json, and upload
  - coveralls-lcov -v -n coverage.info > coverage.c.json
  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls-merge coverage.c.json; fi
-# - coveralls
 notifications:
   email:
     recipients: