Why is this a thing
Merge branch 'master' of github.com:seldo/makomi-source-util

Conflicts:
	node_modules/npm/Makefile
	node_modules/npm/doc/api/npm.md
	node_modules/npm/doc/cli/npm.md
	node_modules/npm/html/doc/README.html
	node_modules/npm/html/doc/index.html
	node_modules/npm/html/docfoot.html
	node_modules/npm/html/dochead.html
	node_modules/npm/lib/build.js
	node_modules/npm/lib/cache.js
	node_modules/npm/lib/help-search.js
	node_modules/npm/lib/help.js
	node_modules/npm/lib/install.js
	node_modules/npm/lib/npm.js
	node_modules/npm/lib/unbuild.js
	node_modules/npm/man/man1/npm.1
	node_modules/npm/man/man3/npm.3
	node_modules/npm/node_modules/fstream/package.json
	node_modules/npm/node_modules/glob/package.json
	node_modules/npm/node_modules/graceful-fs/graceful-fs.js
	node_modules/npm/node_modules/graceful-fs/package.json
	node_modules/npm/node_modules/graceful-fs/test/open.js
	node_modules/npm/node_modules/lockfile/README.md
	node_modules/npm/node_modules/lockfile/lockfile.js
	node_modules/npm/node_modules/lockfile/package.json
	node_modules/npm/node_modules/lockfile/test/basic.js
	node_modules/npm/node_modules/node-gyp/bin/node-gyp.js
	node_modules/npm/node_modules/node-gyp/gyp/AUTHORS
	node_modules/npm/node_modules/node-gyp/gyp/PRESUBMIT.py
	node_modules/npm/node_modules/node-gyp/gyp/gyptest.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/android.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/eclipse.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/msvs_emulation.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
	node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcodeproj_file.py
	node_modules/npm/node_modules/node-gyp/gyp/tools/emacs/gyp-tests.el
	node_modules/npm/node_modules/node-gyp/gyp/tools/emacs/gyp.el
	node_modules/npm/node_modules/node-gyp/lib/configure.js
	node_modules/npm/node_modules/node-gyp/lib/remove.js
	node_modules/npm/node_modules/node-gyp/package.json
	node_modules/npm/node_modules/npm-registry-client/node_modules/couch-login/package.json
	node_modules/npm/node_modules/npm-registry-client/package.json
	node_modules/npm/node_modules/npmlog/log.js
	node_modules/npm/node_modules/npmlog/package.json
	node_modules/npm/node_modules/npmlog/test/basic.js
	node_modules/npm/package.json
	node_modules/npm/scripts/doc-build.sh
	node_modules/npm/scripts/index-build.js