Disable samba by default, enable ssh
Merge remote-tracking branch 'upstream/master' into development