make stampede work
Merge branch 'devel'

Conflicts:
	configs/xsede.json