Use our version of mkdirp
Merge branch 'node-modules'