Initial efforts to migrate shop to payment1.0
WIP: removed ShopPayment references, bug fixes etc. Making way for omnipay!