Update dependencies and such to master