Tidy up configurationfilepath handling
Merge branch 'master' of https://github.com/bcmodular/scopesync