Merge pull request #1 from kenwest/failed-payment

Failed payment
code tidy up - remove unused code, fix spelling, comments
more minore tidy ups
revert change on cancelSubscription signature to match parent
Merge remote-tracking branch 'eileenmcnaughton/master' into collaborate

Conflicts:
	CRM/Core/Payment/Ewayrecurring.php
Merge branch 'collaborate' into leave-null-subsciption-url-unchanged