add opendiff as mergetool, add git serve alias, add editor