lonestar git commit
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life

Conflicts:
	Stampy-1.0.22-1.spec
	bismark-0.7.12-1.spec
	decryption.2.3.2-5-1.spec
	rum-2.0.5-1.spec
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life

Conflicts:
	rum-2.0.5-1.spec
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life
bugfix on soapdenovo2 and macs2
Merge branch 'master' of https://github.com/mwvaughn/tacc-sci-life