Update package.json for publishing
Merge remote-tracking branch 'origin/master' into build-config