Change to new-style RVM dotfiles
Add details on git story-pull and merging