revert to gnome-terminal for easier config
use vimdiff as difftool
pentadactyl changed the rc. meh.