Move composer/composer from require-dev to require

Also update dependency syntax