Fixing PayPal issues. Closes #210

Yes, this commit is a mess. I'm currently working on a rewrite of the
cart so this will be all cleaned up as part of that process.