bug fixes for bioconductor 2.14
Merge branch 'master' of github.com:bhaibeka/genefu

Conflicts:
	DESCRIPTION