Remove dotfiles, gitsh and better placement for RVM
fix conflict