snapshot
snapshot
merge
massive dump of renames and resource cleanup and and and...
nighty night
convergence
convergence
convergence
use val expansion in data stager, too
Don't we all hate it when we have conflicts with ourself?  Makes you aware how
difficult it is to retrace you thoughts from as little as a day ago...  Or maybe
thats just me... :P

Merge branch 'cleanup_for_v1' of github.com:saga-project/troy into cleanup_for_v1

Conflicts:
	troy/workload/workload.py
	troy/workload/workload_manager.py