Removes rvm.  Cuts back on gems needed.
Fixes merge conflicts.