Sync bcbio-nextgen with @chapmanb

Has been a while, better not to let divergence happen again :-)