Added package.json for npm users
Merged in upstream changes, and resolved conflicts.