sync with upstream, bowtie2 and picard back to custom from homebrew