Merged OpenMW/openmw master into user settings.

I've merged the openmw master branch into my user settings code, and merged that back into my fork's master - hope this works.