Fix to .travis.yml so that required Bioconductor packages are installed.
Fix merge conflict