Fix setup-ubuntu.sh
Use ppa for git in ubuntu
Fix GIT_SSH check
Fix diff check on ubuntu
Merge branch 'master' into imo-desk