various
Change editor en gitconfig
pentadactyl conflicts