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

Conflicts:
	macs2-2.0.10-2.spec