shell: Don't force SSH term if on a Mac
Merge branch 'planning' into planning-mac