updating npm-tweets to work with new twitter and npmjs.org APIs.
fixed merge conflict.