commit changes
Merge branch 'master' of github.com:warelab/gramene-ensembl
Merge branch 'master' of github.com:warelab/gramene-ensembl

Conflicts:
	gramene/conf/Plugins.pm