Upgrade Q, and change allResolved() to allSettled()

Not fully tested