Revert "Merge branch 'master' of github.com:chapmanb/bcbio-nextgen"

This reverts commit 08a678995e801a914b430bc514c9738ceb817386, reversing
changes made to 90b894beb37171c894067f5e91dd523e89662d8e.