Merge branch 'master' of github.com:saga-project/saga-pilot
Merge branch 'master' of github.com:saga-project/saga-pilot
Merge branch 'master' of github.com:saga-project/saga-pilot
Merge branch 'master' of github.com:saga-project/saga-pilot
Merge branch 'master' of github.com:saga-project/saga-pilot
fix stampede entry
Merge branch 'devel'
Merge branch 'devel'

Conflicts:
	configs/xsede.json
Merge branch 'devel'
Merge branch 'devel'
This closes #55

This addresses both, the reasonable and the silly comment ;-)