update to ssh
Merge branch 'master' of ssh://github.com/yapale/ubuntu