Sorting out the correct settings files
Working settings.
Fixes the /logout issue in this branch (having fixed it already in
master)