merge of bioconductor svn and github repo