PayPal IPN tweaks. See https://github.com/matthiask/plata/commit/8152ce30
make get_shop_urls overridable on a per-url basis for ease of redecorating...
Merge remote-tracking branch 'DrMeers/master' into next

* DrMeers/master:
  make get_shop_urls overridable on a per-url basis for ease of redecorating...
  PayPal IPN tweaks. See https://github.com/matthiask/plata/commit/8152ce30

Conflicts:
	plata/shop/views.py
	tests/testapp/tests/views.py