Merge pull request #269 from chris18890/dev

Reviewed all changes and approved.  minor tidy of payment, amazon & paypal files for readability