Merge based upon Masterwork 4e / SWP

This merge should fully integrate 4e and my modest patches on top of it into your repo, without you having to know any fancy git-fu. :)

If anything looks wrong after it, let me know. Obviously you'll need to do a 'git pull' on your master branch on your machine to download all the changes.  (And if you've done any work you haven't pushed to github, then I'd recommend doing that first before accepting this merge request.)

Best regards!

Paul