responses to angus's comments
Changes take 2
Merge pull request #304 from gocardless/new-changes

New changes