fix paths to node modules to support both local and global modes
Merge remote-tracking branch 'origin/master'
changes file