allow multiple payment providers ensure API doesn't break
Merge pull request #1913 from andymckay/multiple

allow multiple payment providers, ensure API doesn't break