Reconcile changes
Add chruby and remove rvm