RSpec 3
Merge pull request #67 from gocardless/rspec-3

RSpec 3
Add retry_conflicts class method to Machine which automatically retries conflicts
Change retry API to be parameter on transition_to