Updated Gemfile to use correct rvm gemset
Merge feature complete