added gk=git-kompare and gl=git log ...
also added git-kompare script
Merge branch 'master' of https://github.com/beitz/settings