Pretty print cmd usage.
Fixed Makefile
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/xen-analysis/xentrace-analysis

Fix merge.
Conflicts:
	Makefile