Fix composer.json to use ~ more appropriately; add 'clean' Make target.