Merge branch 'master' of https://github.com/soyuka/pidusage

Conflicts:
	lib/stats.js
	test/stresstest.js