Fixed pull request for @RQuadling's comments

@RQuadling's changes from https://github.com/gocardless/gocardless-php/pulls/27 with the misplaced commit reverted. Ready to merge for next release!