Paypal fork

Some clean-up and minor changes to make sure that all tests run fine. I also added a new command-line command "--enable-remote" to run the remote tests.
Not worried about it for this PR, but in the future, be sure to trim whitespace.