Refactor some stuff; freshen RVM install stuff