cleanup
Retry composer preparation if they fail
Merge pull request #32 from Happyr/cleanup

Cleanup