converting to .ruby-version
moving from .rvmrc to .ruby-version
fix conflicts in gemfile