Merge from SWP / settings

None of these changes are particularly significant, but my change control systems *really* like it when the formatting in the master raw files (in the Dwarf Fortress directory) match the formatting in the tileset directories, hence some of the whitespace-only changes.

This should bring your repo in-line with my current master branch. :)

~ pjf