Merge remote-tracking branch 'origin/dev-v1.1' into wilma

.travis.yml

@@ -39,6 +39,7 @@ install:
  - gem install coveralls-lcov
  - easy_install --upgrade requests
  - easy_install --upgrade coveralls
+ - pip install codecov
  - if $REQUIRES_PYNBODY; then pip install git+git://github.com/pynbody/pynbody.git; fi
  - python setup.py build_ext --coverage --single_ext --inplace
  - python setup.py develop --single_ext
@@ -47,7 +48,10 @@ script:
 after_success:
  # Generate lcov output 
  - lcov --capture --base-directory . --directory build/temp.linux-x86_64-2.7/galpy/ --output-file coverage.info
- # combine, generate json, and upload
+ # Codecov
+ - codecov
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then bash <(curl -s https://codecov.io/bash) -v; fi
+ # coveralls: 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
 notifications:

README.rst

@@ -9,8 +9,8 @@ galpy
 .. image:: https://img.shields.io/coveralls/jobovy/galpy.svg
   :target: https://coveralls.io/r/jobovy/galpy?branch=master
 
-.. image:: http://img.shields.io/badge/C%20coverage-99%-brightgreen.svg
-   :target: http://sns.ias.edu/~bovy/galpy_lcov/
+.. image:: http://codecov.io/github/jobovy/galpy/coverage.svg?branch=master
+  :target: http://codecov.io/github/jobovy/galpy?branch=master
 
 .. image:: https://readthedocs.org/projects/galpy/badge/?version=latest
   :target: http://galpy.readthedocs.org/en/latest/
@@ -89,6 +89,9 @@ DETAILED BUILD, COVERAGE, AND DOCUMENTATION STATUS
 .. image:: https://img.shields.io/coveralls/jobovy/galpy.svg
   :target: https://coveralls.io/r/jobovy/galpy?branch=master
 
+.. image:: http://codecov.io/github/jobovy/galpy/coverage.svg?branch=master
+  :target: http://codecov.io/github/jobovy/galpy?branch=master
+
 .. image:: https://readthedocs.org/projects/galpy/badge/?branch=master?version=latest
   :target: http://galpy.readthedocs.org/en/master/
 
@@ -101,6 +104,9 @@ DETAILED BUILD, COVERAGE, AND DOCUMENTATION STATUS
 .. image:: https://img.shields.io/coveralls/jobovy/galpy.svg?branch=dev-v1.1
   :target: https://coveralls.io/r/jobovy/galpy?branch=dev-v1.1
 
+.. image:: http://codecov.io/github/jobovy/galpy/coverage.svg?branch=dev-v1.1
+  :target: http://codecov.io/github/jobovy/galpy?branch=dev-v1.1
+
 .. image:: https://readthedocs.org/projects/galpy/badge/?branch=master?version=latest
   :target: http://galpy.readthedocs.org/en/dev-v1.1/