Merge pull request dib-lab#1887 from dib-lab/osx-build

Fix build for OS X

master branch tag for Daniel

Merge pull request dib-lab#1803 from dib-lab/fix/docker_build

[MRG] Switch to use TRAVIS_COMMIT instead of TRAVIS_PULL_REQUEST_SHA

Merge pull request dib-lab#1797 from dib-lab/fix/setup-cython

[MRG] Stopgap for conditional cython import

Merge pull request dib-lab#1740 from wltrimbl/removedebugging

Remove debugging output from filter-abundant-single.py

Move paper location

Merge pull request dib-lab#1703 from dib-lab/v2.1/final-tweaks

[MRG] Minor tweaks

Merge pull request dib-lab#1702 from dib-lab/pre-release

A few small changes

Merge pull request dib-lab#1692 from dib-lab/fix/pre_v21rc1

Update author lists

Merge pull request dib-lab#1685 from dib-lab/doc/testing-example

[MRG] Add example to "a quick guide for testing"