Allow for multiple payment providers (bug 969041)

DO NOT MERGE

This is the absolute minimum needed to get tests passing with a one to many addon to payment accounts.

The commented out code is stuff I'm not sure can be deleted (tests were passing though).