updating gems
moving to rbenv
Merge branch 'hotfix-norelease'
adding rb-readline
adding conflict resolutions