BuyNow Buttons with Variations (rebased)

I wish I had stronger Git skills. This has been rebased against the master and after a few scary moments in mergetool, I think this is working as expected.