Updated deps, and kept composer.lock in now.