Merge pull request #27 from dougborg/master

Issue #26: Allow local npm to override bundled npm.
Update CHANGELOG.md