Tweak error messages in anticipation of integration with buildkit
Add composer.json