add rvm to PATH
add Kaleidoscope as difftool and mergetool, add github stuff, slightly tweak settings based on my old gitconfig