Look for pref file matching the save file as a fallback. [671, 758]
Merge Ben Semmbler's pref file matching change.

The game will first look for a user pref file matching the character name (as it currently does). If that fails, it will try to find one matching the savefile name. Should address parts of #671 and #758.
Fix merge in line with coding style