Adding NPM binaries to the PATH
Sync'd with latest from master