Tidy up
Merge branch 're-ui' of github.com:guardian/composer-restorer into re-ui