Updated gems, .ruby-version instead of .rmvrc
Merge with master