merging changes from branch-ensembl-70
merging changes from branch-ensembl-70

Ensembl/public-plugins,muffato/public-plugins,andrewyatz/public-plugins,andrewyatz/public-plugins,andrewyatz/public-plugins,muffato/public-plugins,andrewyatz/public-plugins,muffato/public-plugins,andrewyatz/public-plugins,Ensembl/public-plugins,muffato/public-plugins,Ensembl/public-plugins