Merge pull request #2 from mekf/master

updated to ruby 2
updated rvm, looks like .ruby-version is the way to go now