update package.json and add .npmignore
Merge remote-tracking branch 'origin/master'