Much simpler HTTP_X_FORWARDED_PROTO header fix

Also set Paypoint and Worldpay to be more consistent/inclusive when
checking for HTTPS