Bcbio devel

Merge with upstream master