Combine payment and intro step
Merge pull request #6260 from edx/will/combine-intro-and-make-payment

Combine payment and intro step