Handle race conditions more thoroughly
Handle race conditions more thoroughly

This stuff is hard to get into a standalone test, but
I'm hammering on it by trying to install express in 15
different folders in parallel.

npm/lockfile,npm/lockfile,Deividy/lockfile