switch to published npm version
Merge branch 'master' into fuzz-pipe

Conflicts:
	bin/package.json