(cgates) Adjusted rollup to be invoked directly
Merge branch 'develop' of github.com:umich-brcf-bioinf/Jacquard into develop

Conflicts:
	jacquard/rollup_genes.py