use gvim as git editor
alias xlock to gnome-screensaver.

xlock isnt available on ubuntu repos anymore.