Switch from .rvmrc to .ruby-version and .ruby-gemset.
Switch rubygems to https.
Add --no-edit to git merges in test so the tests do not prompt.