Refactoring, using rvm and bundler now

Change-Id: I3b3c82b3593443bb0b8058648dded4cc38d0fef2