Fix circle
Merge pull request #68 from gocardless/fix-circle

Fix circle
Add retry_conflicts class method to Machine which automatically retries conflicts