gitconfig: changed mergetool to vimdiff
zlogin: removed
zshrc: added rvm scripting bullshit to the end of the file after removing it from zlogin