Fix improperly use of the footer element (bug 764605)
Use CDN when returning rocketfuel collections images URLs (bug 990295)

Also set-up Cache-Control for images and authorize anonymous to
make OPTIONS/HEAD requests (which makes manual testing much easier)
remove git conflicts
allow multiple payment providers ensure API doesn't break
fix up test
stop mis-configuration and ensure its set on -dev
Allow for multiple payment providers (bug 969041)