Optimise paypal gateway, and revise encoding.

#5798
Rename touch punch to stop grunt breaking minify
Decode redirect URL only when needed to prevent PayPal issues

Fixes #5798