Use async.queue to prevent completely killing the system on large amounts of files
Merge branch 'scaling-fix'