updates composer.json to match dev-master