gitconfig: set mergetool back to opendiff
zshrc: fixed NODE_PATH export, fixed PATH export's rvm addition