Many fixes. Deprecate remote mounting method.
Merge branch 'master' of https://github.com/rfru/settings