Cleaups
Merge branch 'master' of ssh://github.com/peadar/pstack

Conflicts:
	pstack.cc