isaacs/npm moved to npm/npm
Upgrade dependencies.
Merge branch 'master' into with-grunt-etc

Conflicts:
	.jshintrc
	lib/entry.js
	lib/github.js
	package.json