Updates to support NPM package creation
Merge pull request #306 from khawkins/npm

Updates to support NPM package creation