User preferences file
Improve merging
Update configuration.rst
Correcting quotes
Merge pull request #498 from ciaranmcnulty/local-prefs-file

User preferences file