im in ur fork, merging ur branch

This should not only merge everything in my master into your master, but it also removes the idea of having a separate 'settings' branch which stores the source code.  That goes in master, because we're software developers, dammit, and that's what git is for. :)

I'll whip up a dedicated release process if anyone complains about there being source code in the experimental, unofficial, development branch of the mod of that game with the steep learning curve they're playing. :)

~ pjf