Npm

Related to #1 (closed) trying to merge this into python_generate... branch before merging that branch to master

This merge updates to handle npm