Faster tramp settings - default to ssh rather than scpc
Merge branch 'master' into desktop