Updated commits from upstream/master

Hey Splinterz,

This pull request merges all the upstream things which have been occurring on my master branch since you last merged. The most notable differences is a *lot* of bugs have been fixed in the tilesets. Where possible they all work the same as the masterwork tilesets now.

There were a couple of tangles I had to tweak by hand, but I don't expect any of them should cause any problems.

Merging this into your branch will make sure that your new settings code (and any other changes) work with all the stable bugfixes in Studded With Patches (which I presume Meph will integrate into the official releases).

~ pjf