Remove old RVM stuff
Add rebase & rerere