ssh completions, mac additions
html/js tab chagnes
Merge conflicts